Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions anda/lib/terra-curl/0001-libcurl-multilib.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
From 6bb4e674cdc953f5c0048aa84172539900725166 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 16 Dec 2025 10:04:40 +0100
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 a1c8185875..bb43ca8335 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -74,7 +74,7 @@ while test "$#" -gt 0; do
;;

--cc)
- echo '@CC@'
+ echo 'gcc'
;;

--prefix)
@@ -149,16 +149,7 @@ while test "$#" -gt 0; do
;;

--libs)
- if test "@libdir@" != '/usr/lib' && test "@libdir@" != '/usr/lib64'; then
- curllibdir="-L@libdir@ "
- else
- curllibdir=''
- fi
- if test '@ENABLE_SHARED@' = 'no'; then
- echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
- else
- echo "${curllibdir}-lcurl"
- fi
+ echo '-lcurl'
;;

--ssl-backends)
@@ -166,16 +157,12 @@ while test "$#" -gt 0; do
;;

--static-libs)
- if test '@ENABLE_STATIC@' != 'no'; 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 12ad245b79..fa0e03d273 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 c0ba5244a8..f3645e1748 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.52.0
8 changes: 8 additions & 0 deletions anda/lib/terra-curl/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
project pkg {
rpm {
spec = "terra-curl.spec"
}
labels {
subrepo = "extras"
}
}
100 changes: 100 additions & 0 deletions anda/lib/terra-curl/key.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: Hostname:
Version: Hockeypuck 2.2

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
+rHjK2O3m7G3ombohdX1yvLyLrE=
=S39+
-----END PGP PUBLIC KEY BLOCK-----
Loading
Loading