From 6054f8a91283eba4975c260dc7afa5b2d67452e6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 19 Jun 2024 17:26:01 +1100 Subject: [PATCH 1/5] remove unused hcc variant --- recipe/conda_build_config.yaml | 1 - recipe/meta.yaml | 17 +---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a09d21d7..8188a267 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -11,5 +11,4 @@ libclang_soversion: variant: - default - - hcc # [linux] - root_63202 # [linux or osx] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 881e6f08..a2011ae3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,9 +30,6 @@ source: - patches/0007-set-libclang-SOVERSION-unconditionally.patch - patches/0008-Make-PIE-default-on-macOS-too.patch - patches/0009-Find-conda-gcc-installation.patch - # check out git history before LLVM 16 for these patches - # - patches/amd-roc-2.7.0.diff # [variant != "hcc"] - # - patches/amd-roc-hcc-2.7.0.diff # [variant == "hcc"] {% if variant and variant.startswith("root_") %} # ROOT patches to clang 16 - patches/root/0001-Remove-warning-about-CMake-3.20.0-in-LLVM-17.patch @@ -109,7 +106,6 @@ source: build: number: {{ build_number }} - skip: true # [variant == "hcc"] requirements: build: @@ -158,7 +154,6 @@ outputs: script: install_clangdev.bat # [win] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: @@ -208,7 +203,6 @@ outputs: - lib/libclang-cpp.16.dylib # [osx] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: @@ -247,12 +241,11 @@ outputs: - name: libclang-cpp # note that this is just an empty wrapper on windows script: install_libclang_cpp.sh # [unix] - files: # [unix] + files: # [unix] - lib/libclang-cpp.so # [linux] - lib/libclang-cpp.dylib # [osx] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: # [unix] @@ -297,7 +290,6 @@ outputs: - lib/libclang.13.dylib # [osx] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: @@ -362,7 +354,6 @@ outputs: - lib/libclang.dylib # [osx] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: @@ -411,7 +402,6 @@ outputs: - Library/bin/clang-{{ major_version }}.exe # [win] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: @@ -466,7 +456,6 @@ outputs: script: install_clang_symlinks.bat # [win] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: @@ -506,7 +495,6 @@ outputs: script: install_clangxx.bat # [win] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: @@ -548,7 +536,6 @@ outputs: - bin/clang-format-{{ major_version }} # [unix] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} # for windows, use the clang-format package. @@ -596,7 +583,6 @@ outputs: - Library/bin/clang-format.exe # [win] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: @@ -642,7 +628,6 @@ outputs: script: install_clang_tools.bat # [win] build: track_features: - - hcc # [variant=="hcc"] - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: From ac11e9312786804bcea75d8a71219de51d23f6e7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 20 Jul 2023 20:30:26 +0200 Subject: [PATCH 2/5] structure test sections a bit more --- recipe/meta.yaml | 105 ++++++++++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 43 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2011ae3..7160bf33 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -143,9 +143,10 @@ test: - $PREFIX/bin/clang -v -c mytest.c # [unix] - '%LIBRARY_BIN%/clang -v -c mytest.c' # [win] - - if not exist %LIBRARY_INC%\\clang\\Lex\\Lexer.h exit 1 # [win] - - test -f $PREFIX/include/clang/Lex/Lexer.h # [unix] - - test -f $PREFIX/lib/libclangBasic.a # [unix] + - test -f $PREFIX/lib/libclangBasic.a # [unix] + + - if not exist %LIBRARY_INC%\clang\Lex\Lexer.h exit 1 # [win] + - test -f $PREFIX/include/clang/Lex/Lexer.h # [unix] outputs: @@ -191,10 +192,13 @@ outputs: - llvmdev =={{ version }} test: commands: - - test -f "$PREFIX/include/clang/Config/config.h" # [unix] - - test -f "$PREFIX/lib/libclangAST.a" # [unix] - - if not exist %LIBRARY_INC%\\clang/Config/config.h exit 1 # [win] - - if not exist %LIBRARY_LIB%\\clangAST.lib exit 1 # [win] + # static library + - test -f $PREFIX/lib/libclangAST.a # [unix] + - if not exist %LIBRARY_LIB%\clangAST.lib exit 1 # [win] + + # headers + - test -f $PREFIX/include/clang/Config/config.h # [unix] + - if not exist %LIBRARY_INC%\clang\Config\config.h exit 1 # [win] - name: libclang-cpp{{ minor_aware_ext }} script: install_libclang_cpp.sh # [unix] @@ -233,10 +237,13 @@ outputs: - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] test: commands: - - test ! -f "$PREFIX/lib/libclang-cpp.so" # [linux] - - test -f "$PREFIX/lib/libclang-cpp.so.{{ minor_aware_ext }}" # [linux] - - test ! -f "$PREFIX/lib/libclang-cpp.dylib" # [osx] - - test -f "$PREFIX/lib/libclang-cpp.{{ minor_aware_ext }}.dylib" # [osx] + # presence of versioned library + - test -f $PREFIX/lib/libclang-cpp.so.{{ minor_aware_ext }} # [linux] + - test -f $PREFIX/lib/libclang-cpp.{{ minor_aware_ext }}.dylib # [osx] + + # absence of unversioned library + - test ! -f $PREFIX/lib/libclang-cpp.so # [linux] + - test ! -f $PREFIX/lib/libclang-cpp.dylib # [osx] - name: libclang-cpp # note that this is just an empty wrapper on windows @@ -277,9 +284,12 @@ outputs: - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix] test: commands: - - test -f "$PREFIX/lib/libclang-cpp.so" # [linux] - - test -f "$PREFIX/lib/libclang-cpp.dylib" # [osx] - - if exist %LIBRARY_BIN%\\libclang-cpp.dll exit 1 # [win] + # presence on unix + - test -f $PREFIX/lib/libclang-cpp.so # [linux] + - test -f $PREFIX/lib/libclang-cpp.dylib # [osx] + + # absence on windows + - if exist %LIBRARY_BIN%\libclang-cpp.dll exit 1 # [win] - name: libclang{{ libclang_soversion }} script: install_libclang.sh # [unix] @@ -323,26 +333,26 @@ outputs: test: commands: # presence of versioned libraries - - test -f "$PREFIX/lib/libclang.so.{{ libclang_soversion }}" # [linux] - - test -f "$PREFIX/lib/libclang.{{ libclang_soversion }}.dylib" # [osx] - - if not exist %LIBRARY_BIN%\\libclang-{{ libclang_soversion }}.dll exit 1 # [win] + - test -f $PREFIX/lib/libclang.so.{{ libclang_soversion }} # [linux] + - test -f $PREFIX/lib/libclang.{{ libclang_soversion }}.dylib # [osx] + - if not exist %LIBRARY_BIN%\libclang-{{ libclang_soversion }}.dll exit 1 # [win] # absence of unversioned libraries - - test ! -f "$PREFIX/lib/libclang.so" # [linux] - - test ! -f "$PREFIX/lib/libclang.dylib" # [osx] - - if exist %LIBRARY_BIN%\\libclang.dll exit 1 # [win] - - if exist %LIBRARY_LIB%\\libclang.lib exit 1 # [win] + - test ! -f $PREFIX/lib/libclang.so # [linux] + - test ! -f $PREFIX/lib/libclang.dylib # [osx] + - if exist %LIBRARY_BIN%\libclang.dll exit 1 # [win] + - if exist %LIBRARY_LIB%\libclang.lib exit 1 # [win] {% if libclang_soversion != major_version %} # absence of major version if soversion is different - - test ! -f "$PREFIX/lib/libclang.so.{{ major_version }}" # [linux] - - test ! -f "$PREFIX/lib/libclang.{{ major_version }}.dylib" # [osx] - - if exist %LIBRARY_BIN%\\libclang-{{ major_version }}.dll exit 1 # [win] + - test ! -f $PREFIX/lib/libclang.so.{{ major_version }} # [linux] + - test ! -f $PREFIX/lib/libclang.{{ major_version }}.dylib # [osx] + - if exist %LIBRARY_BIN%\libclang-{{ major_version }}.dll exit 1 # [win] # same for full version (i.e. with major that doesn't match soversion) - - test ! -f "$PREFIX/lib/libclang.so.{{ version }}" # [linux] - - test ! -f "$PREFIX/lib/libclang.{{ version }}.dylib" # [osx] - - if exist %LIBRARY_BIN%\\libclang-{{ version }}.dll exit 1 # [win] + - test ! -f $PREFIX/lib/libclang.so.{{ version }} # [linux] + - test ! -f $PREFIX/lib/libclang.{{ version }}.dylib # [osx] + - if exist %LIBRARY_BIN%\libclang-{{ version }}.dll exit 1 # [win] {% endif %} - name: libclang @@ -388,9 +398,9 @@ outputs: - {{ pin_subpackage("libclang" ~ libclang_soversion, exact=True) }} test: commands: - - test -f "$PREFIX/lib/libclang.so" # [linux] - - test -f "$PREFIX/lib/libclang.dylib" # [osx] - - if not exist %LIBRARY_LIB%\\libclang.lib exit 1 # [win] + - test -f $PREFIX/lib/libclang.so # [linux] + - test -f $PREFIX/lib/libclang.dylib # [osx] + - if not exist %LIBRARY_LIB%\libclang.lib exit 1 # [win] - name: clang-{{ major_version }} script: install_clang.sh # [unix] @@ -437,19 +447,28 @@ outputs: - llvm-tools {{ version }} test: commands: + # presence of versioned libraries + - test -f $PREFIX/lib/libclang-cpp.so.{{ minor_aware_ext }} # [linux] + - test -f $PREFIX/lib/libclang-cpp.{{ minor_aware_ext }}.dylib # [osx] + + # absence of unversioned libraries + - test ! -f $PREFIX/lib/libclang-cpp.so # [linux] + - test ! -f $PREFIX/lib/libclang-cpp.dylib # [osx] + + # headers + - test -f $PREFIX/lib/clang/{{ major_version }}/include/stdatomic.h # [unix] + - if not exist %LIBRARY_LIB%\clang\{{ major_version }}\include\stdatomic.h exit 1 # [win] + + # versioned binaries - clang-{{ major_version }} --version - - test ! -f "$PREFIX/bin/clang" # [unix] - - test ! -f "$PREFIX/bin/clang-cl" # [unix] - - test ! -f "$PREFIX/bin/clang-cpp" # [unix] - - if exist %LIBRARY_BIN%\\clang.exe exit 1 # [win] - - if exist %LIBRARY_BIN%\\clang-cl.exe exit 1 # [win] - - if exist %LIBRARY_BIN%\\clang-cpp.exe exit 1 # [win] - - test ! -f "$PREFIX/lib/libclang-cpp.so" # [linux] - - test -f "$PREFIX/lib/libclang-cpp.so.{{ minor_aware_ext }}" # [linux] - - test ! -f "$PREFIX/lib/libclang-cpp.dylib" # [osx] - - test -f "$PREFIX/lib/libclang-cpp.{{ minor_aware_ext }}.dylib" # [osx] - - test -f "$PREFIX/lib/clang/{{ version.split('.')[0] }}/include/stdatomic.h" # [unix] - - if not exist %LIBRARY_LIB%\\clang\\{{ version.split('.')[0] }}\\include\\stdatomic.h exit 1 # [win] + + # absence of unversioned binaries + - test ! -f $PREFIX/bin/clang # [unix] + - test ! -f $PREFIX/bin/clang-cl # [unix] + - test ! -f $PREFIX/bin/clang-cpp # [unix] + - if exist %LIBRARY_BIN%\clang.exe exit 1 # [win] + - if exist %LIBRARY_BIN%\clang-cl.exe exit 1 # [win] + - if exist %LIBRARY_BIN%\clang-cpp.exe exit 1 # [win] - name: clang script: install_clang_symlinks.sh # [unix] @@ -621,7 +640,7 @@ outputs: commands: - clang-format --version - test ! -f ${PREFIX}/bin/c-index-test # [unix] - - if exist %LIBRARY_BIN%\\c-index-test.exe exit 1 # [win] + - if exist %LIBRARY_BIN%\c-index-test.exe exit 1 # [win] - name: clang-tools script: install_clang_tools.sh # [unix] From c2688854b81992107a1cb53e17ab4d7914cb136f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 28 Jun 2024 11:42:05 +1100 Subject: [PATCH 3/5] reactivate clangdev tests these got left out once the "package" name changed to clang_packages in https://github.com/conda-forge/clangdev-feedstock/commit/8fc9c5795341e29f5a602693b60458d9fc5e5c0e --- recipe/meta.yaml | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7160bf33..21da6286 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -129,26 +129,6 @@ requirements: - zlib - zstd -test: - requires: - - {{ compiler('cxx') }} - - cmake - files: - - mytest.c - commands: - - $PREFIX/bin/clang --version # [unix] - - $PREFIX/bin/clang++ --version # [unix] - - $PREFIX/bin/clang-check --version # [unix] - - - $PREFIX/bin/clang -v -c mytest.c # [unix] - - '%LIBRARY_BIN%/clang -v -c mytest.c' # [win] - - - test -f $PREFIX/lib/libclangBasic.a # [unix] - - - if not exist %LIBRARY_INC%\clang\Lex\Lexer.h exit 1 # [win] - - test -f $PREFIX/include/clang/Lex/Lexer.h # [unix] - - outputs: - name: clangdev script: install_clangdev.sh # [unix] @@ -191,14 +171,32 @@ outputs: - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - llvmdev =={{ version }} test: + requires: + - {{ compiler('cxx') }} + - cmake + files: + - mytest.c commands: # static library - test -f $PREFIX/lib/libclangAST.a # [unix] + - test -f $PREFIX/lib/libclangBasic.a # [unix] - if not exist %LIBRARY_LIB%\clangAST.lib exit 1 # [win] + - if not exist %LIBRARY_LIB%\clangBasic.lib exit 1 # [win] # headers - test -f $PREFIX/include/clang/Config/config.h # [unix] + - test -f $PREFIX/include/clang/Lex/Lexer.h # [unix] - if not exist %LIBRARY_INC%\clang\Config\config.h exit 1 # [win] + - if not exist %LIBRARY_INC%\clang\Lex\Lexer.h exit 1 # [win] + + # symlinks + - $PREFIX/bin/clang --version # [unix] + - $PREFIX/bin/clang++ --version # [unix] + - $PREFIX/bin/clang-check --version # [unix] + + # basic compilation + - $PREFIX/bin/clang -v -c mytest.c # [unix] + - '%LIBRARY_BIN%/clang -v -c mytest.c' # [win] - name: libclang-cpp{{ minor_aware_ext }} script: install_libclang_cpp.sh # [unix] From 02e11147b45eb759592ffbba5ec1ab09da2a8632 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 26 Aug 2024 16:34:47 +1100 Subject: [PATCH 4/5] switch to using libcxx-devel --- recipe/meta.yaml | 55 ++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 21da6286..8c6c0c14 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "16.0.6" %} {% set major_version = version.split(".")[0] %} -{% set build_number = 11 %} +{% set build_number = 12 %} {% set minor_aware_ext = major_version %} {% if version.split(".")[1] | int > 0 %} @@ -123,7 +123,7 @@ requirements: - zlib # [build_platform != target_platform] - zstd # [build_platform != target_platform] host: - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib @@ -157,7 +157,7 @@ outputs: - {{ pin_subpackage("libclang", exact=True) }} - {{ pin_subpackage("libclang-cpp", exact=True) }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib @@ -168,8 +168,9 @@ outputs: - {{ pin_subpackage("clang-tools", exact=True) }} - {{ pin_subpackage("libclang", exact=True) }} - {{ pin_subpackage("libclang-cpp", exact=True) }} - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - llvmdev =={{ version }} + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: requires: - {{ compiler('cxx') }} @@ -226,13 +227,14 @@ outputs: host: - llvm =={{ version }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: # presence of versioned library @@ -272,14 +274,15 @@ outputs: - llvm =={{ version }} - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix] # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: # presence on unix @@ -321,13 +324,14 @@ outputs: - llvm =={{ version }} - {{ pin_subpackage("clang", exact=True) }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: # presence of versioned libraries @@ -386,14 +390,15 @@ outputs: - {{ pin_subpackage("clang", exact=True) }} - {{ pin_subpackage("libclang" ~ libclang_soversion, exact=True) }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - {{ pin_subpackage("libclang" ~ libclang_soversion, exact=True) }} + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: - test -f $PREFIX/lib/libclang.so # [linux] @@ -424,20 +429,20 @@ outputs: - cmake - ninja # [win] - make # [unix] - - libcxx # [osx] - llvmdev =={{ version }} # [build_platform != target_platform] host: - llvm =={{ version }} - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix] # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }} # [unix] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] run_constrained: - clangdev {{ version }} - clangxx {{ version }} @@ -484,7 +489,7 @@ outputs: host: - {{ pin_subpackage("clang-" ~ major_version, exact=True) }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib @@ -523,13 +528,14 @@ outputs: host: - {{ pin_subpackage("clang", exact=True) }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - libstdcxx-devel_{{ target_platform }} # [linux] + - libcxx-devel # [osx] - {{ pin_subpackage("clang", exact=True) }} test: requires: @@ -578,14 +584,15 @@ outputs: - {{ pin_subpackage("libclang-cpp", exact=True) }} - llvm =={{ version }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: - clang-format-{{ major_version }} --version @@ -625,15 +632,16 @@ outputs: - {{ pin_subpackage("clang-format-" ~ major_version, exact=True) }} # [unix] - llvm =={{ version }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix] - {{ pin_subpackage("clang-format-" ~ major_version, exact=True) }} # [unix] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] test: commands: - clang-format --version @@ -670,17 +678,18 @@ outputs: - {{ pin_subpackage("clang-format", exact=True) }} - llvm =={{ version }} # Use the same requirements as the top-level requirements - - libcxx {{ cxx_compiler_version }} # [osx] + - libcxx-devel {{ cxx_compiler_version }} # [osx] - llvmdev =={{ version }} - libxml2 - zlib - zstd run: - ucrt # [win] - - {{ pin_compatible("libcxx", max_pin=None) }} # [osx] - {{ pin_subpackage("clang-format", exact=True) }} - {{ pin_subpackage("libclang" ~ libclang_soversion, max_pin=None) }} - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix] + # we need to do this manually because clang_bootstrap has no run-export + - libcxx >={{ cxx_compiler_version }} # [osx] run_constrained: - clangdev {{ version }} test: From 4044a929ac3658876a93424834503b10b43a78fa Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 27 Aug 2024 17:51:05 +1100 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.26.19.18.07 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_variantdefault.yaml | 2 +- .ci_support/linux_64_variantroot_63202.yaml | 2 +- .ci_support/linux_aarch64_variantdefault.yaml | 2 +- .ci_support/linux_aarch64_variantroot_63202.yaml | 2 +- .ci_support/linux_ppc64le_variantdefault.yaml | 2 +- .ci_support/linux_ppc64le_variantroot_63202.yaml | 2 +- .ci_support/osx_64_variantdefault.yaml | 2 +- .ci_support/osx_64_variantroot_63202.yaml | 2 +- .ci_support/osx_arm64_variantdefault.yaml | 2 +- .ci_support/osx_arm64_variantroot_63202.yaml | 2 +- .scripts/run_osx_build.sh | 2 +- build-locally.py | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcdf..204327b7 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_variantdefault.yaml b/.ci_support/linux_64_variantdefault.yaml index 3c963d69..97aaf012 100644 --- a/.ci_support/linux_64_variantdefault.yaml +++ b/.ci_support/linux_64_variantdefault.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 libclang_soversion: diff --git a/.ci_support/linux_64_variantroot_63202.yaml b/.ci_support/linux_64_variantroot_63202.yaml index 28ad483b..15320604 100644 --- a/.ci_support/linux_64_variantroot_63202.yaml +++ b/.ci_support/linux_64_variantroot_63202.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 libclang_soversion: diff --git a/.ci_support/linux_aarch64_variantdefault.yaml b/.ci_support/linux_aarch64_variantdefault.yaml index 9393050e..12f348ab 100644 --- a/.ci_support/linux_aarch64_variantdefault.yaml +++ b/.ci_support/linux_aarch64_variantdefault.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 libclang_soversion: diff --git a/.ci_support/linux_aarch64_variantroot_63202.yaml b/.ci_support/linux_aarch64_variantroot_63202.yaml index 2bc23a69..1a82b341 100644 --- a/.ci_support/linux_aarch64_variantroot_63202.yaml +++ b/.ci_support/linux_aarch64_variantroot_63202.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 libclang_soversion: diff --git a/.ci_support/linux_ppc64le_variantdefault.yaml b/.ci_support/linux_ppc64le_variantdefault.yaml index 4736bf2e..08146244 100644 --- a/.ci_support/linux_ppc64le_variantdefault.yaml +++ b/.ci_support/linux_ppc64le_variantdefault.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 libclang_soversion: diff --git a/.ci_support/linux_ppc64le_variantroot_63202.yaml b/.ci_support/linux_ppc64le_variantroot_63202.yaml index 51c88b71..12233bc5 100644 --- a/.ci_support/linux_ppc64le_variantroot_63202.yaml +++ b/.ci_support/linux_ppc64le_variantroot_63202.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 libclang_soversion: diff --git a/.ci_support/osx_64_variantdefault.yaml b/.ci_support/osx_64_variantdefault.yaml index b0d1ef65..3c78a05b 100644 --- a/.ci_support/osx_64_variantdefault.yaml +++ b/.ci_support/osx_64_variantdefault.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libclang_soversion: - '13' libxml2: diff --git a/.ci_support/osx_64_variantroot_63202.yaml b/.ci_support/osx_64_variantroot_63202.yaml index d58b0586..e67fc030 100644 --- a/.ci_support/osx_64_variantroot_63202.yaml +++ b/.ci_support/osx_64_variantroot_63202.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libclang_soversion: - '13' libxml2: diff --git a/.ci_support/osx_arm64_variantdefault.yaml b/.ci_support/osx_arm64_variantdefault.yaml index cfeeea8a..dccaca8b 100644 --- a/.ci_support/osx_arm64_variantdefault.yaml +++ b/.ci_support/osx_arm64_variantdefault.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libclang_soversion: - '13' libxml2: diff --git a/.ci_support/osx_arm64_variantroot_63202.yaml b/.ci_support/osx_arm64_variantroot_63202.yaml index beb3854d..8f885c9e 100644 --- a/.ci_support/osx_arm64_variantroot_63202.yaml +++ b/.ci_support/osx_arm64_variantroot_63202.yaml @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '16' +- '17' libclang_soversion: - '13' libxml2: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c8791..420f051c 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 e0d408d0..d78427b5 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):