From: Peter Müller <peter.mueller@ipfire.org>
Date: Thu, 15 Sep 2022 19:36:29 +0000 (+0000)
Subject: curl: Fix build on armv6l
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3890da81da9dba0c4035c61f26ef2fb080644319;p=people%2Fpmueller%2Fipfire-2.x.git

curl: Fix build on armv6l

https://github.com/curl/curl/pull/9054

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/lfs/curl b/lfs/curl
index 636bdd5350..fc8057e0be 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -70,6 +70,10 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+
+	# Incorporate upstream patch to fix build on armv6l
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch
+
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--disable-ipv6 \
diff --git a/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch b/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch
new file mode 100644
index 0000000000..15992d31b9
--- /dev/null
+++ b/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch
@@ -0,0 +1,24 @@
+commit e2e7f54b7bea521fa8373095d0f43261a720cda0
+Author: Daniel Stenberg <daniel@haxx.se>
+Date:   Mon Jun 27 08:46:21 2022 +0200
+
+    easy_lock.h: include sched.h if available to fix build
+    
+    Patched-by: Harry Sintonen
+    
+    Closes #9054
+
+diff --git a/lib/easy_lock.h b/lib/easy_lock.h
+index 819f50ce8..1f54289ce 100644
+--- a/lib/easy_lock.h
++++ b/lib/easy_lock.h
+@@ -36,6 +36,9 @@
+ 
+ #elif defined (HAVE_ATOMIC)
+ #include <stdatomic.h>
++#if defined(HAVE_SCHED_YIELD)
++#include <sched.h>
++#endif
+ 
+ #define curl_simple_lock atomic_bool
+ #define CURL_SIMPLE_LOCK_INIT false