diff options
Diffstat (limited to 'net-misc/curl/files')
| -rw-r--r-- | net-misc/curl/files/curl-7.30.0-prefix.patch | 21 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-fix-gnutls-nettle.patch | 27 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-respect-cflags-3.patch | 14 |
3 files changed, 62 insertions, 0 deletions
diff --git a/net-misc/curl/files/curl-7.30.0-prefix.patch b/net-misc/curl/files/curl-7.30.0-prefix.patch new file mode 100644 index 000000000000..fd495c49b132 --- /dev/null +++ b/net-misc/curl/files/curl-7.30.0-prefix.patch @@ -0,0 +1,21 @@ +diff -Naur curl-7.30.0.orig/curl-config.in curl-7.30.0/curl-config.in +--- curl-7.30.0.orig/curl-config.in 2013-02-06 09:44:37.000000000 -0500 ++++ curl-7.30.0/curl-config.in 2013-04-17 18:43:56.000000000 -0400 +@@ -134,7 +134,7 @@ + else + CPPFLAG_CURL_STATICLIB="" + fi +- if test "X@includedir@" = "X/usr/include"; then ++ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then + echo "$CPPFLAG_CURL_STATICLIB" + else + echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" +@@ -142,7 +142,7 @@ + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then ++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then + CURLLIBDIR="-L@libdir@ " + else + CURLLIBDIR="" diff --git a/net-misc/curl/files/curl-fix-gnutls-nettle.patch b/net-misc/curl/files/curl-fix-gnutls-nettle.patch new file mode 100644 index 000000000000..fbacb7748bdc --- /dev/null +++ b/net-misc/curl/files/curl-fix-gnutls-nettle.patch @@ -0,0 +1,27 @@ +diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac +--- curl-7.25.0.orig//configure.ac 2012-04-04 17:24:48.000000000 -0400 ++++ curl-7.25.0/configure.ac 2012-04-04 17:23:07.000000000 -0400 +@@ -1823,20 +1823,9 @@ + + if test "$GNUTLS_ENABLED" = "1"; then + USE_GNUTLS_NETTLE= +- # First check if we can detect either crypto library via transitive linking +- AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ]) +- if test "$USE_GNUTLS_NETTLE" = ""; then +- AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ]) +- fi +- # If not, try linking directly to both of them to see if they are available +- if test "$USE_GNUTLS_NETTLE" = ""; then +- AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ]) +- fi +- if test "$USE_GNUTLS_NETTLE" = ""; then +- AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ]) +- fi +- if test "$USE_GNUTLS_NETTLE" = ""; then +- AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found]) ++ AC_ARG_WITH(nettle) ++ if test "x$withval" = "xyes"; then ++ USE_GNUTLS_NETTLE=1 + fi + if test "$USE_GNUTLS_NETTLE" = "1"; then + AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend]) diff --git a/net-misc/curl/files/curl-respect-cflags-3.patch b/net-misc/curl/files/curl-respect-cflags-3.patch new file mode 100644 index 000000000000..4a4a614ee49a --- /dev/null +++ b/net-misc/curl/files/curl-respect-cflags-3.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index e9b49c7..e374ab6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -280,9 +280,6 @@ dnl ********************************************************************** + + CURL_CHECK_COMPILER + CURL_SET_COMPILER_BASIC_OPTS +-CURL_SET_COMPILER_DEBUG_OPTS +-CURL_SET_COMPILER_OPTIMIZE_OPTS +-CURL_SET_COMPILER_WARNING_OPTS + + if test "$compiler_id" = "INTEL_UNIX_C"; then + # |