haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
7323968eb1961c29f1d2c38b85bcae6b635d2c6d
haikuports/net-misc/curl/patches/17954.patch
Schrijvers Luc 7f00d43e29 curl, bump to 8.14.1 (#12547) 
* curl, bump to 8.14.1

* Fix build for 32bit, implicit declarations of __builtin_popcountll and __builtin_ctzll
2025-07-18 07:40:28 +00:00

255 lines
9.9 KiB
Diff
Raw Blame History

From e4f059760eddd4611137668a3753984a6f42219a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 17 Jul 2025 18:13:37 +0200
Subject: [PATCH 1/7] curl/system.h: fix for gcc 2.x and older
Follow-up to 909af1a43b5a7fed8b5a4ca145e39f46b2f50325 #16761
Reported-by: Schrijvers Luc
Fixes #17951
---
include/curl/system.h | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/curl/system.h b/include/curl/system.h
index ebcdc5e4fd00..2bf5df6ceaf6 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -336,8 +336,10 @@
# define CURL_FORMAT_CURL_OFF_TU "llu"
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
-# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
-# define CURL_CTZ64(x) __builtin_ctzll(x)
+# if __GNUC__ >= 3
+# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
+# define CURL_CTZ64(x) __builtin_ctzll(x)
+# endif
# elif defined(__LP64__) || \
defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) || \
defined(__e2k__) || \
@@ -348,8 +350,10 @@
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
-# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
-# define CURL_CTZ64(x) __builtin_ctzl(x)
+# if __GNUC__ >= 3
+# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
+# define CURL_CTZ64(x) __builtin_ctzl(x)
+# endif
# endif
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
# define CURL_PULL_SYS_TYPES_H 1
From 2dcf3dfd079de0f3fbf981d81c323c6764dfea12 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 17 Jul 2025 18:28:05 +0200
Subject: [PATCH 2/7] 3.4.x is required
---
include/curl/system.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/curl/system.h b/include/curl/system.h
index 2bf5df6ceaf6..6ed1a98ffc17 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -336,7 +336,7 @@
# define CURL_FORMAT_CURL_OFF_TU "llu"
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
-# if __GNUC__ >= 3
+# if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
# define CURL_CTZ64(x) __builtin_ctzll(x)
# endif
@@ -350,7 +350,7 @@
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
-# if __GNUC__ >= 3
+# if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
# define CURL_CTZ64(x) __builtin_ctzl(x)
# endif
From dadc09d910929c5a1a06af96952ae2462b71dd63 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 17 Jul 2025 18:44:59 +0200
Subject: [PATCH 3/7] extra safety for public headers
---
include/curl/system.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/curl/system.h b/include/curl/system.h
index 6ed1a98ffc17..e25e8b312761 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -336,7 +336,8 @@
# define CURL_FORMAT_CURL_OFF_TU "llu"
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
-# if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+# if (__GNUC__ >= 4) || \
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
# define CURL_CTZ64(x) __builtin_ctzll(x)
# endif
@@ -350,7 +351,8 @@
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
-# if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+# if (__GNUC__ >= 4) || \
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
# define CURL_CTZ64(x) __builtin_ctzl(x)
# endif
From 6cf696f62a5b4af4a8534ac4a22e9aa549b3409a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 17 Jul 2025 18:45:56 +0200
Subject: [PATCH 4/7] explicitly include clang, for clarity
---
include/curl/system.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/curl/system.h b/include/curl/system.h
index e25e8b312761..a985501b1c16 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -337,7 +337,8 @@
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
# if (__GNUC__ >= 4) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
+ defined(__clang__)
# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
# define CURL_CTZ64(x) __builtin_ctzll(x)
# endif
@@ -352,7 +353,8 @@
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# if (__GNUC__ >= 4) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
+ defined(__clang__)
# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
# define CURL_CTZ64(x) __builtin_ctzl(x)
# endif
From 111aad71b95c7d288aa07d17a0eda1feaf277e90 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 17 Jul 2025 18:47:59 +0200
Subject: [PATCH 5/7] fix long lines
---
include/curl/system.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/curl/system.h b/include/curl/system.h
index a985501b1c16..a9bd92ed6aad 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -336,9 +336,8 @@
# define CURL_FORMAT_CURL_OFF_TU "llu"
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
-# if (__GNUC__ >= 4) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
- defined(__clang__)
+# if (__GNUC__ >= 4) || defined(__clang__) || \
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
# define CURL_CTZ64(x) __builtin_ctzll(x)
# endif
@@ -352,9 +351,8 @@
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
-# if (__GNUC__ >= 4) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
- defined(__clang__)
+# if (__GNUC__ >= 4) || defined(__clang__) || \
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
# define CURL_CTZ64(x) __builtin_ctzl(x)
# endif
From a1005355fc68cf178da62a3c4b1017ce8ec4678f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 17 Jul 2025 18:50:12 +0200
Subject: [PATCH 6/7] Revert "fix long lines"
This reverts commit 111aad71b95c7d288aa07d17a0eda1feaf277e90.
---
include/curl/system.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/curl/system.h b/include/curl/system.h
index a9bd92ed6aad..a985501b1c16 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -336,8 +336,9 @@
# define CURL_FORMAT_CURL_OFF_TU "llu"
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
-# if (__GNUC__ >= 4) || defined(__clang__) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
+# if (__GNUC__ >= 4) || \
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
+ defined(__clang__)
# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
# define CURL_CTZ64(x) __builtin_ctzll(x)
# endif
@@ -351,8 +352,9 @@
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
-# if (__GNUC__ >= 4) || defined(__clang__) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
+# if (__GNUC__ >= 4) || \
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
+ defined(__clang__)
# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
# define CURL_CTZ64(x) __builtin_ctzl(x)
# endif
From 7438a00c7ca6558334bd1f265207392cbe051d09 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 17 Jul 2025 18:50:19 +0200
Subject: [PATCH 7/7] Revert "explicitly include clang, for clarity"
This reverts commit 6cf696f62a5b4af4a8534ac4a22e9aa549b3409a.
---
include/curl/system.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/curl/system.h b/include/curl/system.h
index a985501b1c16..e25e8b312761 100644
--- a/include/curl/system.h
+++ b/include/curl/system.h
@@ -337,8 +337,7 @@
# define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_TU ULL
# if (__GNUC__ >= 4) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
- defined(__clang__)
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountll(x)
# define CURL_CTZ64(x) __builtin_ctzll(x)
# endif
@@ -353,8 +352,7 @@
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# if (__GNUC__ >= 4) || \
- ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4)) || \
- defined(__clang__)
+ ((__GNUC__ == 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 4))
# define CURL_POPCOUNT64(x) __builtin_popcountl(x)
# define CURL_CTZ64(x) __builtin_ctzl(x)
# endif
Reference in New Issue View Git Blame Copy Permalink