Blame SOURCES/0101-curl-7.32.0-multilib.patch

5130b6
From 2a4754a3a7cf60ecc36d83cbe50b8c337cb87632 Mon Sep 17 00:00:00 2001
5130b6
From: Kamil Dudka <kdudka@redhat.com>
5130b6
Date: Fri, 12 Apr 2013 12:04:05 +0200
5130b6
Subject: [PATCH] prevent multilib conflicts on the curl-config script
5130b6
5130b6
---
5130b6
 curl-config.in     |   21 +++------------------
5130b6
 docs/curl-config.1 |    4 +++-
5130b6
 libcurl.pc.in      |    1 +
5130b6
 3 files changed, 7 insertions(+), 19 deletions(-)
5130b6
5130b6
diff --git a/curl-config.in b/curl-config.in
5130b6
index 150004d..95d0759 100644
5130b6
--- a/curl-config.in
5130b6
+++ b/curl-config.in
5130b6
@@ -75,7 +75,7 @@ while test $# -gt 0; do
5130b6
         ;;
5130b6
 
5130b6
     --cc)
5130b6
-        echo "@CC@"
5130b6
+        echo "gcc"
5130b6
         ;;
5130b6
 
5130b6
     --prefix)
5130b6
@@ -142,29 +142,14 @@ while test $# -gt 0; do
5130b6
         ;;
5130b6
 
5130b6
     --libs)
5130b6
-        if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
5130b6
-           CURLLIBDIR="-L@libdir@ "
5130b6
-        else
5130b6
-           CURLLIBDIR=""
5130b6
-        fi
5130b6
-        if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
5130b6
-          echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
5130b6
-        else
5130b6
-          echo ${CURLLIBDIR}-lcurl
5130b6
-        fi
5130b6
+        echo -lcurl
5130b6
         ;;
5130b6
 
5130b6
     --static-libs)
5130b6
-        if test "X@ENABLE_STATIC@" != "Xno" ; then
5130b6
-          echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
5130b6
-        else
5130b6
-          echo "curl was built with static libraries disabled" >&2
5130b6
-          exit 1
5130b6
-        fi
5130b6
         ;;
5130b6
 
5130b6
     --configure)
5130b6
-        echo @CONFIGURE_OPTIONS@
5130b6
+        pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
5130b6
         ;;
5130b6
 
5130b6
     *)
5130b6
diff --git a/docs/curl-config.1 b/docs/curl-config.1
5130b6
index 14a9d2b..ffcc004 100644
5130b6
--- a/docs/curl-config.1
5130b6
+++ b/docs/curl-config.1
5130b6
@@ -65,7 +65,9 @@ be listed using uppercase and are separated by newlines. There may be none,
5130b6
 one, or several protocols in the list. (Added in 7.13.0)
5130b6
 .IP "--static-libs"
5130b6
 Shows the complete set of libs and other linker options you will need in order
5130b6
-to link your application with libcurl statically. (Added in 7.17.1)
5130b6
+to link your application with libcurl statically. Note that Fedora/RHEL libcurl
5130b6
+packages do not provide any static libraries, thus cannot be linked statically.
5130b6
+(Added in 7.17.1)
5130b6
 .IP "--version"
5130b6
 Outputs version information about the installed libcurl.
5130b6
 .IP "--vernum"
5130b6
diff --git a/libcurl.pc.in b/libcurl.pc.in
5130b6
index 2ba9c39..f8f8b00 100644
5130b6
--- a/libcurl.pc.in
5130b6
+++ b/libcurl.pc.in
5130b6
@@ -29,6 +29,7 @@ libdir=@libdir@
5130b6
 includedir=@includedir@
5130b6
 supported_protocols="@SUPPORT_PROTOCOLS@"
5130b6
 supported_features="@SUPPORT_FEATURES@"
5130b6
+configure_options=@CONFIGURE_OPTIONS@
5130b6
 
5130b6
 Name: libcurl
5130b6
 URL: https://curl.haxx.se/
5130b6
-- 
5130b6
2.5.0
5130b6