The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...

[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / libxmlrpc / 0004-use-correct-curl-config.patch

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/libxmlrpc/0004-use-correct-curl-config.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/libxmlrpc/0004-use-correct-curl-config.patch
new file mode 100644 (file)
index 0000000..b581643
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/libxmlrpc/0004-use-correct-curl-config.patch
@@ -0,0 +1,96 @@
+Use correct curl-config program
+
+Instead of calling directly curl-config in src/Makefile (which ends up
+calling the wrong curl-config: the one in the PATH instead of the one
+pointed at by the environment variables at configure time), let's
+define a CURL_CONFIG variable that contains the path to the proper
+curl-config program, and use it where appropriate.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+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
+-  TRANSPORT_LIBDEP += $(shell curl-config --libs)
++  TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs)
+ 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
++++ b/config.mk.in
+@@ -32,6 +32,7 @@
+ LSOCKET = @LSOCKET@
+ WININET_LDADD = @WININET_LDADD@
+ WININET_LIBDIR = @WININET_LIBDIR@
++CURL_CONFIG = @CURL_CONFIG@
+ CURL_LDADD = @CURL_LDADD@
+ CURL_LIBDIR = @CURL_LIBDIR@
+ LIBWWW_LDADD = @LIBWWW_LDADD@
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -550,6 +550,8 @@
+     dnl So we don't do any check now.  If we find out there's a problem with
+     dnl older Curls, we will revisit that.
+ 
++    AC_SUBST(CURL_CONFIG)
++
+     CURL_LDADD=$($CURL_CONFIG --libs)
+     AC_SUBST(CURL_LDADD)
+ 
+Index: b/lib/curl_transport/Makefile
+===================================================================
+--- a/lib/curl_transport/Makefile
++++ b/lib/curl_transport/Makefile
+@@ -29,7 +29,7 @@
+ 
+ $(SRCDIR)/common.mk: srcdir blddir
+ 
+-CURL_VERSION := $(shell curl-config --vernum)
++CURL_VERSION := $(shell $(CURL_CONFIG) --vernum)
+ 
+ # Some time at or before Curl 7.12, <curl/types.h> became an empty file
+ # (no-op).  Some time after Curl 7.18, <curl/types.h> ceased to exist.
+@@ -43,7 +43,7 @@
+   CFLAGS_LOCAL += -DNEED_CURL_TYPES_H
+ endif
+ 
+-CURL_INCLUDES := $(shell curl-config --cflags)
++CURL_INCLUDES := $(shell $(CURL_CONFIG) --cflags)
+ # 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)