summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-06-10 00:26:06 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-06-10 00:26:06 +0000
commitd01de9cc432a1ce405a57de53e2d5d0bf1df32e0 (patch)
tree9bfe2b64d6479ee72d87df33f686fe5969ac83a0
parent02dfe37d917ebb0d4b8476ccf37081bdf7eeb31a (diff)
downloadmidipix_build-d01de9cc432a1ce405a57de53e2d5d0bf1df32e0.tar.bz2
midipix_build-d01de9cc432a1ce405a57de53e2d5d0bf1df32e0.tar.xz
Provide temporary fix for building curl with slibtool:
Move $(libcurl_la_LDFLAGS) to the very end of the libcurl.la $(LIBTOOL) command line to correctly add all dependent libraries.
-rw-r--r--curl-7.47.1.local.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/curl-7.47.1.local.patch b/curl-7.47.1.local.patch
index 430db3d5..d24c88c9 100644
--- a/curl-7.47.1.local.patch
+++ b/curl-7.47.1.local.patch
@@ -57,3 +57,23 @@
+ ;;
+esac
+
+--- curl-7.47.1/lib/Makefile.in.orig 2016-02-07 14:43:49.000000000 +0000
++++ curl-7.47.1/lib/Makefile.in 2016-06-10 00:07:28.334457112 +0000
+@@ -243,7 +243,7 @@
+ am__v_lt_1 =
+ libcurl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcurl_la_CFLAGS) \
+- $(CFLAGS) $(libcurl_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CFLAGS) $(LDFLAGS) -o $@
+ libcurlu_la_LIBADD =
+ am__objects_6 = libcurlu_la-file.lo libcurlu_la-timeval.lo \
+ libcurlu_la-base64.lo libcurlu_la-hostip.lo \
+@@ -842,7 +842,7 @@
+ vtls/$(DEPDIR)/$(am__dirstamp)
+
+ libcurl.la: $(libcurl_la_OBJECTS) $(libcurl_la_DEPENDENCIES) $(EXTRA_libcurl_la_DEPENDENCIES)
+- $(AM_V_CCLD)$(libcurl_la_LINK) -rpath $(libdir) $(libcurl_la_OBJECTS) $(libcurl_la_LIBADD) $(LIBS)
++ $(AM_V_CCLD)$(libcurl_la_LINK) -rpath $(libdir) $(libcurl_la_OBJECTS) $(libcurl_la_LIBADD) $(LIBS) $(libcurl_la_LDFLAGS)
+ vtls/libcurlu_la-openssl.lo: vtls/$(am__dirstamp) \
+ vtls/$(DEPDIR)/$(am__dirstamp)
+ vtls/libcurlu_la-gtls.lo: vtls/$(am__dirstamp) \