diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,7 +24,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 60effb7..0c43522 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -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: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index fc85b91..bd5fb6f 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.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: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 986e424..adaddbd 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.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: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 32d1c14..12a4bda 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libxml2: - '2' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 6228801..78de52d 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libxml2: - '2' macos_machine: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 97dc8d9..6c805a9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,7 +69,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 0c9e992..4ebc38f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 604ca9e..0289382 100644 --- a/recipe/meta.yaml +++ b/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: diff --git a/recipe/patches/0001-no-code-sign.patch b/recipe/patches/0001-no-code-sign.patch index 1f3706a..6c27a98 100644 --- a/recipe/patches/0001-no-code-sign.patch +++ b/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 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 ------------------- diff --git a/recipe/patches/0002-Revert-Declare-_availability_version_check-as-weak_i.patch b/recipe/patches/0002-Revert-Declare-_availability_version_check-as-weak_i.patch new file mode 100644 index 0000000..045aad2 --- /dev/null +++ b/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" +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,