92 lines
2.6 KiB
Diff
92 lines
2.6 KiB
Diff
From 84b7e1cf486761e99361f5dcf5879cd7baf51b58 Mon Sep 17 00:00:00 2001
|
|
From: Jan Macku <jamacku@redhat.com>
|
|
Date: Thu, 1 Feb 2024 13:01:23 +0100
|
|
Subject: [PATCH 2/2] prevent multilib conflicts on the curl-config script
|
|
|
|
---
|
|
curl-config.in | 23 +++++------------------
|
|
docs/curl-config.1 | 4 +++-
|
|
libcurl.pc.in | 1 +
|
|
3 files changed, 9 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/curl-config.in b/curl-config.in
|
|
index 54f92d9..15a60da 100644
|
|
--- a/curl-config.in
|
|
+++ b/curl-config.in
|
|
@@ -78,7 +78,7 @@ while test $# -gt 0; do
|
|
;;
|
|
|
|
--cc)
|
|
- echo "@CC@"
|
|
+ echo "gcc"
|
|
;;
|
|
|
|
--prefix)
|
|
@@ -157,32 +157,19 @@ 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@ENABLE_SHARED@" = "Xno"; then
|
|
- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
|
|
- else
|
|
- echo ${CURLLIBDIR}-lcurl
|
|
- fi
|
|
+ echo -lcurl
|
|
;;
|
|
--ssl-backends)
|
|
echo "@SSL_BACKENDS@"
|
|
;;
|
|
|
|
--static-libs)
|
|
- if test "X@ENABLE_STATIC@" != "Xno" ; then
|
|
- echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_LIBS@
|
|
- else
|
|
- echo "curl was built with static libraries disabled" >&2
|
|
- exit 1
|
|
- fi
|
|
+ echo "curl was built with static libraries disabled" >&2
|
|
+ exit 1
|
|
;;
|
|
|
|
--configure)
|
|
- echo @CONFIGURE_OPTIONS@
|
|
+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
|
|
;;
|
|
|
|
*)
|
|
diff --git a/docs/curl-config.1 b/docs/curl-config.1
|
|
index c142cb9..0e189b4 100644
|
|
--- a/docs/curl-config.1
|
|
+++ b/docs/curl-config.1
|
|
@@ -48,7 +48,9 @@ no, one or several names. If more than one name, they will appear
|
|
comma\-separated. (Added in 7.58.0)
|
|
.IP --static-libs
|
|
Shows the complete set of libs and other linker options you will need in order
|
|
-to link your application with libcurl statically. (Added in 7.17.1)
|
|
+to link your application with libcurl statically. Note that Fedora/RHEL libcurl
|
|
+packages do not provide any static libraries, thus cannot be linked statically.
|
|
+(Added in 7.17.1)
|
|
.IP --version
|
|
Outputs version information about the installed libcurl.
|
|
.IP --vernum
|
|
diff --git a/libcurl.pc.in b/libcurl.pc.in
|
|
index 9db6b0f..dcac692 100644
|
|
--- a/libcurl.pc.in
|
|
+++ b/libcurl.pc.in
|
|
@@ -31,6 +31,7 @@ libdir=@libdir@
|
|
includedir=@includedir@
|
|
supported_protocols="@SUPPORT_PROTOCOLS@"
|
|
supported_features="@SUPPORT_FEATURES@"
|
|
+configure_options=@CONFIGURE_OPTIONS@
|
|
|
|
Name: libcurl
|
|
URL: https://curl.se/
|
|
--
|
|
2.43.0
|
|
|