curl: Fix curl-config --libs which put out all different kinds of libs that curl...

diff --git a/pkgs/core/curl/curl.nm b/pkgs/core/curl/curl.nm
index 9085941b7f7be7d0fb6c35bce0750c02715bbd9f..aceda4fa91f43afbe33524fd8e30349d58f73d37 100644 (file)
--- a/pkgs/core/curl/curl.nm
+++ b/pkgs/core/curl/curl.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = curl
 PKG_VER        = 7.21.2
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER =
 PKG_GROUP      = Application/Internet
@@ -34,8 +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+= autoconf automake libidn-devel libssh2-devel libtool \
-       openldap-devel openssl-devel pkg-config zlib-devel
+PKG_BUILD_DEPS+= autoconf automake groff libidn-devel libssh2-devel libtool \
+       nss-devel openldap-devel pkg-config zlib-devel
 
 define PKG_DESCRIPTION
        cURL is a tool for getting files from HTTP, FTP, FILE, LDAP, LDAPS, \
@@ -58,15 +58,20 @@ PKG_DEPS-libcurl-devel = $(PKG_DEPS-$(PKG_NAME)-devel)
 PKG_BUILD_DEPS-libcurl-devel = $(PKG_BUILD_DEPS-$(PKG_NAME)-devel)
 PKG_SUMMARY-libcurl-devel = $(PKG_SUMMARY-$(PKG_NAME)-devel)
 PKG_FILES-libcurl-devel = $(PKG_FILES-$(PKG_NAME)-devel)
+PKG_PROVIDES-libcurl-devel = curl-devel
 
 CONFIGURE_OPTIONS += \
+       --enable-hidden-symbols \
        --disable-static \
        --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \
        --with-libidn \
        --with-libssh2 \
        --with-nss \
        --enable-ldaps \
-       --enable-ipv6
+       --enable-ipv6 \
+       --enable-manual \
+       --enable-threaded-resolver \
+       --without-ssl
 
 define STAGE_PREPARE_CMDS
        cd $(DIR_APP) && autoreconf -vfi

diff --git a/pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch b/pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch
new file mode 100644 (file)
index 0000000..83c1cd8
--- /dev/null
+++ b/pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch
@@ -0,0 +1,64 @@
+ curl-config.in |   22 ++++------------------
+ libcurl.pc.in  |    1 +
+ 2 files changed, 5 insertions(+), 18 deletions(-)
+
+diff --git a/curl-config.in b/curl-config.in
+index ebda129..b404827 100644
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -43,7 +43,6 @@ Available values for OPTION include:
+   --libs      library linking information
+   --prefix    curl install prefix
+   --protocols newline separated list of enabled protocols
+-  --static-libs static libcurl library linking information
+   --version   output version information
+   --vernum    output the version information as a number (hexadecimal)
+ EOF
+@@ -74,7 +73,7 @@ while test $# -gt 0; do
+       ;;
+ 
+     --cc)
+-      echo "@CC@"
++      echo "gcc"
+       ;;
+ 
+     --prefix)
+@@ -136,25 +135,12 @@ while test $# -gt 0; do
+               ;;
+ 
+     --libs)
+-      if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
+-         CURLLIBDIR="-L@libdir@ "
+-      else
+-         CURLLIBDIR=""
+-      fi
+-      if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+-        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+-      else
+-        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
+-      fi
+-      ;;
+-
+-    --static-libs)
+-      echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
++      pkg-config libcurl --libs
+       ;;
+ 
+     --configure)
+-      echo @CONFIGURE_OPTIONS@
+-    ;;
++      pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
++      ;;
+ 
+     *)
+         echo "unknown option: $1"
+--- a/libcurl.pc.in
++++ b/libcurl.pc.in
+@@ -29,6 +29,7 @@ libdir=@libdir@
+ includedir=@includedir@
+ supported_protocols="@SUPPORT_PROTOCOLS@"
+ supported_features="@SUPPORT_FEATURES@"
++configure_options=@CONFIGURE_OPTIONS@
+ 
+ Name: libcurl
+ URL: http://curl.haxx.se/