93 lines
2.5 KiB
Diff
93 lines
2.5 KiB
Diff
From da51b3d89a33fb3a1cbc5dd5faebc4ee18bbcc46 Mon Sep 17 00:00:00 2001
|
|
From: Jan Macku <jamacku@redhat.com>
|
|
Date: Wed, 11 Sep 2024 09:21:25 +0200
|
|
Subject: [PATCH] prevent multilib conflicts on the curl-config script
|
|
|
|
---
|
|
curl-config.in | 23 +++++------------------
|
|
docs/curl-config.md | 4 +++-
|
|
libcurl.pc.in | 1 +
|
|
3 files changed, 9 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/curl-config.in b/curl-config.in
|
|
index 294e083..df41899 100644
|
|
--- a/curl-config.in
|
|
+++ b/curl-config.in
|
|
@@ -75,7 +75,7 @@ while test "$#" -gt 0; do
|
|
;;
|
|
|
|
--cc)
|
|
- echo '@CC@'
|
|
+ echo 'gcc'
|
|
;;
|
|
|
|
--prefix)
|
|
@@ -155,16 +155,7 @@ 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_PC_LIBS_PRIVATE@"
|
|
- else
|
|
- echo "${curllibdir}-lcurl"
|
|
- fi
|
|
+ echo '-lcurl'
|
|
;;
|
|
|
|
--ssl-backends)
|
|
@@ -172,16 +163,12 @@ while test "$#" -gt 0; do
|
|
;;
|
|
|
|
--static-libs)
|
|
- if test 'X@ENABLE_STATIC@' != 'Xno'; then
|
|
- echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@"
|
|
- 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.md b/docs/curl-config.md
|
|
index 4dfaab6..f4e847e 100644
|
|
--- a/docs/curl-config.md
|
|
+++ b/docs/curl-config.md
|
|
@@ -87,7 +87,9 @@ no, one or several names. If more than one name, they appear comma-separated.
|
|
## --static-libs
|
|
|
|
Shows the complete set of libs and other linker options you need in order to
|
|
-link your application with libcurl statically. (Added in 7.17.1)
|
|
+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)
|
|
|
|
## --version
|
|
|
|
diff --git a/libcurl.pc.in b/libcurl.pc.in
|
|
index 8f6f9b4..f69815c 100644
|
|
--- a/libcurl.pc.in
|
|
+++ b/libcurl.pc.in
|
|
@@ -28,6 +28,7 @@ libdir=@libdir@
|
|
includedir=@includedir@
|
|
supported_protocols="@SUPPORT_PROTOCOLS@"
|
|
supported_features="@SUPPORT_FEATURES@"
|
|
+configure_options=@CONFIGURE_OPTIONS@
|
|
|
|
Name: libcurl
|
|
URL: https://curl.se/
|
|
--
|
|
2.46.0
|
|
|