diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:22:06 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:29:56 +0100 |
| commit | 8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 (patch) | |
| tree | 8b22aaa4e3c283a73fe2af2eccdfa3926a5430ef /package/libxmlrpc/0004-use-correct-curl-config.patch | |
| parent | 42dd856ca930f79a831361e337d25fb8dd6e0dd1 (diff) | |
| parent | 4f29cc436b24a8007b065253babe27b9346a479e (diff) | |
| download | buildroot-8852f08eeda3c9ff4c5f9cc90a169338bda1bff9.tar.gz buildroot-8852f08eeda3c9ff4c5f9cc90a169338bda1bff9.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libxmlrpc/0004-use-correct-curl-config.patch')
| -rw-r--r-- | package/libxmlrpc/0004-use-correct-curl-config.patch | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/package/libxmlrpc/0004-use-correct-curl-config.patch b/package/libxmlrpc/0004-use-correct-curl-config.patch index b5816432d8..f2f1c557ba 100644 --- a/package/libxmlrpc/0004-use-correct-curl-config.patch +++ b/package/libxmlrpc/0004-use-correct-curl-config.patch @@ -12,15 +12,15 @@ Index: b/src/Makefile =================================================================== --- a/src/Makefile +++ b/src/Makefile -@@ -56,7 +56,7 @@ - TRANSPORT_MODS += blddir/lib/curl_transport/curltransaction - TRANSPORT_MODS += blddir/lib/curl_transport/curlmulti - TRANSPORT_MODS += blddir/lib/curl_transport/lock_pthread +@@ -57,7 +57,7 @@ + TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport + TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction + TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti - TRANSPORT_LIBDEP += $(shell curl-config --libs) + TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs) + TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport endif ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) - TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport Index: b/config.mk.in =================================================================== --- a/config.mk.in @@ -68,29 +68,3 @@ Index: b/lib/curl_transport/Makefile # We expect that curl-config --cflags just gives us -I options, because # we need just the -I options for 'make dep'. Plus, it's scary to think # of what any other compiler flag would do to our compile. -Index: b/src/cpp/test/Makefile -=================================================================== ---- a/src/cpp/test/Makefile -+++ b/src/cpp/test/Makefile -@@ -20,7 +20,7 @@ - LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd) - - ifeq ($(MUST_BUILD_CURL_CLIENT),yes) -- LIBS += $(shell curl-config --libs) -+ LIBS += $(shell $(CURL_CONFIG) --libs) - endif - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) - LIBS += $(shell libwww-config --libs) -Index: b/tools/common.mk -=================================================================== ---- a/tools/common.mk -+++ b/tools/common.mk -@@ -15,7 +15,7 @@ - CLIENT_LDLIBS += $(shell libwww-config --libs) - endif - ifeq ($(MUST_BUILD_CURL_CLIENT),yes) -- CLIENT_LDLIBS += $(shell curl-config --libs) -+ CLIENT_LDLIBS += $(shell $(CURL_CONFIG) --libs) - endif - ifeq ($(MUST_BUILD_WININET_CLIENT),yes) - CLIENT_LDLIBS += $(shell wininet-config --libs) |
