From: Peter Kjellerstedt <pkj@axis.com>
Date: Tue, 10 Feb 2026 11:52:25 +0000 (+0100)
Subject: curl: Backport a patch to make curl work when aws support is disabled
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cafee0adc169852ed93585f3f79f76569b94bdda;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

curl: Backport a patch to make curl work when aws support is disabled

This avoids the following error when using curl from curl-native:

  $ oe-run-native curl-native curl https://www.example.com
  Getting sysroot...
  curl: (48) An unknown option was passed in to libcurl

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/curl/curl/0001-config2setopts-fix-for-disable-aws-build-configurati.patch b/meta/recipes-support/curl/curl/0001-config2setopts-fix-for-disable-aws-build-configurati.patch
new file mode 100644
index 00000000000..9294094ecf5
--- /dev/null
+++ b/meta/recipes-support/curl/curl/0001-config2setopts-fix-for-disable-aws-build-configurati.patch
@@ -0,0 +1,33 @@
+From a87f346189ffdc7559771c20961a7c294ed8ba5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maksim=20=C5=9Aciepanienka?= <msciepanienka@gmail.com>
+Date: Tue, 20 Jan 2026 04:19:06 +0100
+Subject: [PATCH] config2setopts: fix for --disable-aws build configuration
+
+Closes #20368
+
+Upstream-Status: Backport [https://github.com/curl/curl/commit/a87f346189ffdc7559771c20961a7c294ed8ba5c]
+Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+---
+ src/config2setopts.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/config2setopts.c b/src/config2setopts.c
+index 5e1722c3ee..a023287834 100644
+--- a/src/config2setopts.c
++++ b/src/config2setopts.c
+@@ -486,12 +486,14 @@ static CURLcode ssl_setopts(struct OperationConfig *config, CURL *curl)
+ /* only called for HTTP transfers */
+ static CURLcode http_setopts(struct OperationConfig *config, CURL *curl)
+ {
+-  CURLcode result;
++  CURLcode result = CURLE_OK;
+   long postRedir = 0;
+ 
+   my_setopt_long(curl, CURLOPT_FOLLOWLOCATION, config->followlocation);
+   my_setopt_long(curl, CURLOPT_UNRESTRICTED_AUTH, config->unrestricted_auth);
++#ifndef CURL_DISABLE_AWS
+   MY_SETOPT_STR(curl, CURLOPT_AWS_SIGV4, config->aws_sigv4);
++#endif
+   my_setopt_long(curl, CURLOPT_AUTOREFERER, config->autoreferer);
+ 
+   if(config->proxyheaders) {
diff --git a/meta/recipes-support/curl/curl_8.18.0.bb b/meta/recipes-support/curl/curl_8.18.0.bb
index b94da348b7a..a151a7be8c4 100644
--- a/meta/recipes-support/curl/curl_8.18.0.bb
+++ b/meta/recipes-support/curl/curl_8.18.0.bb
@@ -14,10 +14,11 @@ SRC_URI = " \
     file://run-ptest \
     file://disable-tests \
     file://no-test-timeout.patch \
+    file://0001-config2setopts-fix-for-disable-aws-build-configurati.patch \
 "
 
 SRC_URI:append:class-nativesdk = " \
-           file://environment.d-curl.sh \
+    file://environment.d-curl.sh \
 "
 
 SRC_URI[sha256sum] = "40df79166e74aa20149365e11ee4c798a46ad57c34e4f68fd13100e2c9a91946"