curl: Fix build with LTO.

diff --git a/pkgs/core/curl/curl.nm b/pkgs/core/curl/curl.nm
index d8dbffe221dce6dd546116dfa829c88b3c4400b2..3f049f0ebf4e316965c315c061eb011db9dfb10a 100644 (file)
--- a/pkgs/core/curl/curl.nm
+++ b/pkgs/core/curl/curl.nm
@@ -34,7 +34,8 @@ PKG_URL        = http://www.curl.haxx.se/
 PKG_LICENSE    = MIT
 PKG_SUMMARY    = A utility for getting files from remote servers (FTP, HTTP, and others).
 
-PKG_BUILD_DEPS+= libidn-devel libssh2-devel openldap-devel openssl-devel pkg-config zlib-devel
+PKG_BUILD_DEPS+= autoconf automake libidn-devel libssh2-devel libtool \
+       openldap-devel openssl-devel pkg-config zlib-devel
 
 define PKG_DESCRIPTION
        cURL is a tool for getting files from HTTP, FTP, FILE, LDAP, LDAPS, \
@@ -67,6 +68,10 @@ CONFIGURE_OPTIONS += \
        --enable-ldaps \
        --enable-ipv6
 
+define STAGE_PREPARE_CMDS
+       cd $(DIR_APP) && autoreconf -vfi
+endef
+
 # Doesn't work
 #define STAGE_TEST
 #      cd $(DIR_APP) && make check

diff --git a/pkgs/core/curl/patches/curl-7.20.0-lrt.patch b/pkgs/core/curl/patches/curl-7.20.0-lrt.patch
new file mode 100644 (file)
index 0000000..775f183
--- /dev/null
+++ b/pkgs/core/curl/patches/curl-7.20.0-lrt.patch
@@ -0,0 +1,30 @@
+ src/Makefile.am           |    2 +-
+ tests/libtest/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3672458..890893d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,7 +49,7 @@ include Makefile.inc
+ # This might hold -Werror
+ CFLAGS += @CURL_CFLAG_EXTRAS@
+ 
+-curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
++curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -lrt
+ curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
+ BUILT_SOURCES = hugehelp.c
+ CLEANFILES = hugehelp.c
+diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
+index 70b0f12..6512ce4 100644
+--- a/tests/libtest/Makefile.am
++++ b/tests/libtest/Makefile.am
+@@ -54,7 +54,7 @@ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl  \
+ test1022.pl Makefile.inc
+ 
+ # Dependencies (may need to be overriden)
+-LDADD = $(top_builddir)/lib/libcurl.la
++LDADD = $(top_builddir)/lib/libcurl.la -lrt
+ DEPENDENCIES = $(top_builddir)/lib/libcurl.la
+ 
+ # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES,