From 92a817896419dec8d4fb6b120b3387ba5531cb8a Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 13 Aug 2006 03:36:54 +0200 Subject: [PATCH] curl: add 7.15.3. GnuTLS enabled. Signed-off-by: Rene Wagner --- ...native_7.14.0.bb => curl-native_7.15.3.bb} | 0 .../curl/{curl_7.14.0.bb => curl_7.15.3.bb} | 8 +++-- .../files/dont-touch-ld-library-path.patch | 36 +++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) rename org.handhelds.familiar/packages/curl/{curl-native_7.14.0.bb => curl-native_7.15.3.bb} (100%) rename org.handhelds.familiar/packages/curl/{curl_7.14.0.bb => curl_7.15.3.bb} (81%) create mode 100644 org.handhelds.familiar/packages/curl/files/dont-touch-ld-library-path.patch diff --git a/org.handhelds.familiar/packages/curl/curl-native_7.14.0.bb b/org.handhelds.familiar/packages/curl/curl-native_7.15.3.bb similarity index 100% rename from org.handhelds.familiar/packages/curl/curl-native_7.14.0.bb rename to org.handhelds.familiar/packages/curl/curl-native_7.15.3.bb diff --git a/org.handhelds.familiar/packages/curl/curl_7.14.0.bb b/org.handhelds.familiar/packages/curl/curl_7.15.3.bb similarity index 81% rename from org.handhelds.familiar/packages/curl/curl_7.14.0.bb rename to org.handhelds.familiar/packages/curl/curl_7.15.3.bb index 609320c..6d31343 100644 --- a/org.handhelds.familiar/packages/curl/curl_7.14.0.bb +++ b/org.handhelds.familiar/packages/curl/curl_7.15.3.bb @@ -2,15 +2,16 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers." LICENSE = "MIT" DEPENDS = "zlib" SECTION = "console/network" -PR = "r2" -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2" +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://dont-touch-ld-library-path.patch;patch=1" S = "${WORKDIR}/curl-${PV}" inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ --without-ssl \ + --with-gnutls \ --with-random=/dev/urandom \ --without-idn" @@ -23,7 +24,8 @@ do_stage () { PACKAGES = "curl curl-doc libcurl libcurl-dev libcurl-doc" FILES_${PN} = "${bindir}/curl" FILES_${PN}-doc = "${mandir}/man1/curl.1" -FILES_lib${PN} = "${libdir}/lib*.so.*" +FILES_lib${PN} = "${libdir}/lib*.so.* \ + ${datadir}/curl/curl-ca-bundle.crt" FILES_lib${PN}-dev = "${includedir} \ ${libdir}/lib*.so \ ${libdir}/lib*.a \ diff --git a/org.handhelds.familiar/packages/curl/files/dont-touch-ld-library-path.patch b/org.handhelds.familiar/packages/curl/files/dont-touch-ld-library-path.patch new file mode 100644 index 0000000..56f06ec --- /dev/null +++ b/org.handhelds.familiar/packages/curl/files/dont-touch-ld-library-path.patch @@ -0,0 +1,36 @@ +--- curl-7.15.3/configure.ac.orig 2006-04-28 23:06:33.000000000 +0200 ++++ curl-7.15.3/configure.ac 2006-04-28 23:07:38.000000000 +0200 +@@ -983,18 +983,6 @@ + + fi + +- if test "$OPENSSL_ENABLED" = "1"; then +- if test -n "$LIB_OPENSSL"; then +- dnl when the ssl shared libs were found in a path that the run-time +- dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH +- dnl to prevent further configure tests to fail due to this +- +- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" +- export LD_LIBRARY_PATH +- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) +- fi +- fi +- + fi + + dnl ********************************************************************** +@@ -1086,14 +1074,6 @@ + if test "x$USE_GNUTLS" = "xyes"; then + AC_MSG_NOTICE([detected GnuTLS version $version]) + +- dnl when shared libs were found in a path that the run-time +- dnl linker doesn't search through, we need to add it to +- dnl LD_LIBRARY_PATH to prevent further configure tests to fail +- dnl due to this +- +- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff" +- export LD_LIBRARY_PATH +- AC_MSG_NOTICE([Added $gtlsprefix/lib$libsuff to LD_LIBRARY_PATH]) + fi + + fi -- 2.41.1