curl (7.56.1-1) unstable; urgency=medium

[curl.git] / debian / patches / 11_omit-directories-from-config.patch

diff --git a/debian/patches/11_omit-directories-from-config.patch b/debian/patches/11_omit-directories-from-config.patch
new file mode 100644 (file)
index 0000000..0d48502
--- /dev/null
+++ b/debian/patches/11_omit-directories-from-config.patch
@@ -0,0 +1,53 @@
+Description: In order to (partially) multi-arch-ify curl-config, remove all
+ mention of @includedir@ and @libdir@ from the script.  On Debian, the actual
+ header and library directories are architecture-dependent, but will always be
+ in the C compiler's default search path, so -I and -L options are not
+ necessary (and may be harmful in multi-arch environments.)
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/731998
+Forwarded: not-needed
+Author: Benjamin Moody <benjamin.moody@gmail.com>
+Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
+Last-Update: 2017-01-10
+
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -23,7 +23,6 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-includedir=@includedir@
+ cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@
+ 
+ usage()
+@@ -134,19 +133,11 @@
+         else
+           CPPFLAG_CURL_STATICLIB=""
+         fi
+-        if test "X@includedir@" = "X/usr/include"; then
+-          echo "$CPPFLAG_CURL_STATICLIB"
+-        else
+-          echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
+-        fi
++        echo "$CPPFLAG_CURL_STATICLIB"
+         ;;
+ 
+     --libs)
+-        if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
+-           CURLLIBDIR="-L@libdir@ "
+-        else
+-           CURLLIBDIR=""
+-        fi
++        CURLLIBDIR=""
+         if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+           echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
+         else
+@@ -156,7 +147,7 @@
+ 
+     --static-libs)
+         if test "X@ENABLE_STATIC@" != "Xno" ; then
+-          echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
++          echo -Wl,-Bstatic -lcurl -Wl,-Bdynamic @LDFLAGS@ @LIBCURL_LIBS@
+         else
+           echo "curl was built with static libraries disabled" >&2
+           exit 1