From d36ad8b2a0e7a7b05853d9e397c93b6f42cc7f03 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 12 Aug 2022 21:53:50 +0300
Subject: Upgrade to 7.84.0

---
 libcurl/libcurl/buildfile | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'libcurl/libcurl/buildfile')

diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile
index d44293f..58f7bb2 100644
--- a/libcurl/libcurl/buildfile
+++ b/libcurl/libcurl/buildfile
@@ -29,6 +29,40 @@ vsc{libcurl}: lib/in{libcurl}
   CURL_LT_SHLIB_VERSIONED_FLAVOUR = 'OPENSSL_'
 }
 
+# It seems that for earlier versions of clang the __has_include_next() macro
+# is broken in the -frewrite-includes mode. So, in particular, the following
+# fragment of llvm-6.0's stdatomic.h:
+#
+#  #if __STDC_HOSTED__ && __has_include_next(<stdatomic.h>)
+#  # include_next <stdatomic.h>
+#  #else
+#  ...
+#  typedef _Atomic(_Bool)              atomic_bool;
+#  ...
+#  #endif
+#
+#  expands into:
+#
+#  #if __STDC_HOSTED__ && (1)/*__has_include_next(<stdatomic.h>)*/
+#  #if 0 /* expanded by -frewrite-includes */
+#  # include_next <stdatomic.h>
+#  #endif /* expanded by -frewrite-includes */
+#  # 31 "/usr/lib/llvm-6.0/lib/clang/6.0.0/include/stdatomic.h" 3
+#  # 32 "/usr/lib/llvm-6.0/lib/clang/6.0.0/include/stdatomic.h" 3
+#  #else
+#  ...
+#  typedef _Atomic(_Bool)              atomic_bool;
+#  ...
+#  #endif
+#
+# This ends up with no atomic_* types defined, etc.
+#
+# Thus, we enable reprocessing for the source files which (indirectly) include
+# <stdatomic.h> for Clang versions prior to 7.0.
+#
+if ($c.id == 'clang' && $c.version.major < 7)
+  lib/obj{easy version}: cc.reprocess = true
+
 # Build options.
 #
 c.poptions += -DBUILDING_LIBCURL -DHAVE_CONFIG_H \
@@ -95,7 +129,9 @@ switch $tclass, $tsys
     # used for the API function declarations. Thus, we don't bother
     # generating/passing the exported symbol list file.
     #
-    c.libs += -framework CoreFoundation -framework Security
+    c.libs += -framework CoreFoundation      \
+              -framework SystemConfiguration \
+              -framework Security
   }
   case 'windows', 'mingw32'
   {
-- 
cgit v1.1