Skip to content

Commit

Permalink
curl.test.patch test final patch
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Nov 7, 2024
1 parent a6a478b commit 967c7c7
Showing 1 changed file with 23 additions and 8 deletions.
31 changes: 23 additions & 8 deletions curl.test.patch
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,28 @@ index e8be5d0ccd9104..804cdebc648032 100644
#endif /* USE_ECH */

#ifdef HAS_ALPN
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -57,7 +57,6 @@
!defined(__clang__) && \
defined(__GNUC__) && __GNUC__ >= 12 && \
-/* Workaround for Homebrew gcc 12.4.0, 13.3.0, 14.1.0 and newer (as of 14.1.0)
+/* Workaround for Homebrew gcc 12.4.0, 13.3.0, 14.1.0, 14.2.0.
+ Fixed it 14.2.0_1. We also omit the workaround for 14.2.0 because there
+ is now way to tall 14.2.0_1 and 14.2.0 apart, and the workaround breaks
+ the fixed 14.2.0_1 version.
that started advertising the `availability` attribute, which then gets used
by Apple SDK, but, in a way incompatible with gcc, resulting in misc errors
inside SDK headers, e.g.:
@@ -53,9 +56,13 @@
Followed by missing declarations.
Fix it by overriding the built-in feature-check macro used by the headers
to enable the problematic attributes. This makes the feature check fail. */
-#if defined(__APPLE__) && \
- !defined(__clang__) && \
- defined(__GNUC__) && __GNUC__ >= 12 && \
+#if defined(__APPLE__) && \
+ !defined(__clang__) && \
+ defined(__GNUC__) && \
+ (__GNUC__ == 12 || \
+ __GNUC__ == 13 || \
+ (__GNUC__ == 14 && \
+ defined(__GNUC_MINOR__) && (__GNUC_MINOR__ <= 1))) && \
defined(__has_attribute)
-#define availability curl_pp_attribute_disabled
#define availability curl_pp_attribute_disabled
#endif

#if defined(__APPLE__)

0 comments on commit 967c7c7

Please sign in to comment.