summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/curl/curl/0001-libcurl.pc.in-drop-LDFLAGS-from-Libs.private.patch39
-rw-r--r--meta/recipes-support/curl/curl_8.11.1.bb (renamed from meta/recipes-support/curl/curl_8.11.0.bb)3
2 files changed, 1 insertions, 41 deletions
diff --git a/meta/recipes-support/curl/curl/0001-libcurl.pc.in-drop-LDFLAGS-from-Libs.private.patch b/meta/recipes-support/curl/curl/0001-libcurl.pc.in-drop-LDFLAGS-from-Libs.private.patch
deleted file mode 100644
index 79fc0b316e..0000000000
--- a/meta/recipes-support/curl/curl/0001-libcurl.pc.in-drop-LDFLAGS-from-Libs.private.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From cfd5d794fdfcc12e386fdbb14161babf54d2a5ee Mon Sep 17 00:00:00 2001
2From: Peter Marko <peter.marko@siemens.com>
3Date: Sat, 9 Nov 2024 22:26:58 +0100
4Subject: [PATCH] libcurl.pc.in: drop LDFLAGS from Libs.private
5
6Stop passing linker flags to pkg-config.
7
8This was added in v8.11.0 with commit [1].
9There are several problems with this, especially:
10* user may want to link curl and application with different flags
11* user usually adds the same or similar flags in all components, so this
12 will double the flags when linking application
13* when building components in temporary directories, these directories
14 are preserved in pkg-config linker flags and are invalid when building
15 application
16
17[1] https://github.com/curl/curl/commit/9f56bb608ecfbb8978c6cb72a04d9e8b23162d82
18
19Upstream-Status: Submitted [https://github.com/curl/curl/pull/15533]
20Signed-off-by: Peter Marko <peter.marko@siemens.com>
21---
22 libcurl.pc.in | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/libcurl.pc.in b/libcurl.pc.in
26index 4c60a7ec7..7898dae35 100644
27--- a/libcurl.pc.in
28+++ b/libcurl.pc.in
29@@ -36,6 +36,6 @@ Version: @CURLVERSION@
30 Requires: @LIBCURL_PC_REQUIRES@
31 Requires.private: @LIBCURL_PC_REQUIRES_PRIVATE@
32 Libs: -L${libdir} -lcurl @LIBCURL_PC_LIBS@
33-Libs.private: @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@
34+Libs.private: @LIBCURL_PC_LIBS_PRIVATE@
35 Cflags: -I${includedir} @LIBCURL_PC_CFLAGS@
36 Cflags.private: @LIBCURL_PC_CFLAGS_PRIVATE@
37--
382.30.2
39
diff --git a/meta/recipes-support/curl/curl_8.11.0.bb b/meta/recipes-support/curl/curl_8.11.1.bb
index a512aa443c..b4d80e9643 100644
--- a/meta/recipes-support/curl/curl_8.11.0.bb
+++ b/meta/recipes-support/curl/curl_8.11.1.bb
@@ -14,9 +14,8 @@ SRC_URI = " \
14 file://run-ptest \ 14 file://run-ptest \
15 file://disable-tests \ 15 file://disable-tests \
16 file://no-test-timeout.patch \ 16 file://no-test-timeout.patch \
17 file://0001-libcurl.pc.in-drop-LDFLAGS-from-Libs.private.patch \
18" 17"
19SRC_URI[sha256sum] = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb" 18SRC_URI[sha256sum] = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56"
20 19
21# Curl has used many names over the years... 20# Curl has used many names over the years...
22CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" 21CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"