revert a patch that causes _availability_version_check to not be fo…

…und (#120)

automerged PR by conda-forge/automerge-action

.ci_support/linux_64_.yaml

@@ -1,17 +1,17 @@
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libxml2:

.ci_support/linux_aarch64_.yaml

@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libxml2:

.ci_support/linux_ppc64le_.yaml

@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libxml2:

.ci_support/osx_64_.yaml

@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '16'
+- '17'
 libxml2:
 - '2'
 macos_machine:

.ci_support/osx_arm64_.yaml

@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '16'
+- '17'
 libxml2:
 - '2'
 macos_machine:

recipe/meta.yaml

@@ -10,9 +10,10 @@ source:
   sha256: 09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856
   patches:
     - patches/0001-no-code-sign.patch
+    - patches/0002-Revert-Declare-_availability_version_check-as-weak_i.patch
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:

recipe/patches/0001-no-code-sign.patch

@@ -1,7 +1,7 @@
-From bf3c5b20918704c6f07f5aecef840376fd3b0806 Mon Sep 17 00:00:00 2001
+From dd35ef6087b81d9d7fc658f1c35557eec1cb733f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 22 Apr 2019 02:00:30 -0500
-Subject: [PATCH] no code sign
+Subject: [PATCH 1/2] no code sign
 
 ---
  compiler-rt/cmake/Modules/AddCompilerRT.cmake | 28 -------------------

recipe/patches/0002-Revert-Declare-_availability_version_check-as-weak_i.patch

@@ -0,0 +1,37 @@
+From d37bc1428cd192a6fa3a967a509805b95a761910 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <h.vetinari@gmx.com>
+Date: Mon, 2 Sep 2024 14:30:13 +1100
+Subject: [PATCH 2/2] Revert "Declare _availability_version_check as
+ weak_import instead of looking it"
+
+This reverts commit b653a2823fe4b4c9c6d85cfe119f31d8e70c2fa0.
+---
+ compiler-rt/lib/builtins/os_version_check.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/compiler-rt/lib/builtins/os_version_check.c b/compiler-rt/lib/builtins/os_version_check.c
+index 182eabe7a6ae..ebfb2dfc72dd 100644
+--- a/compiler-rt/lib/builtins/os_version_check.c
++++ b/compiler-rt/lib/builtins/os_version_check.c
+@@ -86,10 +86,6 @@ typedef Boolean (*CFStringGetCStringFuncTy)(CFStringRef, char *, CFIndex,
+                                             CFStringEncoding);
+ typedef void (*CFReleaseFuncTy)(CFTypeRef);
+
+-extern __attribute__((weak_import))
+-bool _availability_version_check(uint32_t count,
+-                                 dyld_build_version_t versions[]);
+-
+ static void _initializeAvailabilityCheck(bool LoadPlist) {
+   if (AvailabilityVersionCheck && !LoadPlist) {
+     // New API is supported and we're not being asked to load the plist,
+@@ -98,8 +94,8 @@ static void _initializeAvailabilityCheck(bool LoadPlist) {
+   }
+
+   // Use the new API if it's is available.
+-  if (_availability_version_check)
+-    AvailabilityVersionCheck = &_availability_version_check;
++  AvailabilityVersionCheck = (AvailabilityVersionCheckFuncTy)dlsym(
++      RTLD_DEFAULT, "_availability_version_check");
+
+   if (AvailabilityVersionCheck && !LoadPlist) {
+     // New API is supported and we're not being asked to load the plist,