From 6b8af000fa81c211c45e5b96672a8d593d6b8bc9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 14:22:56 +0100 Subject: [PATCH 01/20] Revert "remove rc-channels" This reverts commit bec51e15c13f8dedd0ffafa6a03787a5726924d8. --- recipe/conda_build_config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 3e99c76a..a5ab7032 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,3 +12,9 @@ libclang_soversion: variant: - default - hcc # [linux] + +channel_targets: + - conda-forge llvm_rc + +channel_sources: + - conda-forge/label/llvm_rc,conda-forge From a11232e8135cf6a1281f3d6b101bac5f872b6769 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 14:27:08 +0100 Subject: [PATCH 02/20] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.30.12.16.46 --- .ci_support/linux_64_variantdefault.yaml | 6 +++--- .ci_support/linux_aarch64_variantdefault.yaml | 6 +++--- .ci_support/linux_ppc64le_variantdefault.yaml | 6 +++--- .ci_support/osx_64_.yaml | 6 +++--- .ci_support/osx_arm64_.yaml | 6 +++--- .ci_support/win_64_.yaml | 6 +++--- .gitignore | 13 ++++++++++++- .scripts/build_steps.sh | 6 ------ .scripts/run_docker_build.sh | 6 ++++++ README.md | 16 ++++++++-------- 10 files changed, 44 insertions(+), 33 deletions(-) diff --git a/.ci_support/linux_64_variantdefault.yaml b/.ci_support/linux_64_variantdefault.yaml index 17e38006..9fb67684 100644 --- a/.ci_support/linux_64_variantdefault.yaml +++ b/.ci_support/linux_64_variantdefault.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -13,7 +13,7 @@ docker_image: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - linux-64 variant: diff --git a/.ci_support/linux_aarch64_variantdefault.yaml b/.ci_support/linux_aarch64_variantdefault.yaml index 99046f91..f3d6a157 100644 --- a/.ci_support/linux_aarch64_variantdefault.yaml +++ b/.ci_support/linux_aarch64_variantdefault.yaml @@ -5,9 +5,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -17,7 +17,7 @@ docker_image: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - linux-aarch64 variant: diff --git a/.ci_support/linux_ppc64le_variantdefault.yaml b/.ci_support/linux_ppc64le_variantdefault.yaml index 5be45d37..01c7d4cc 100644 --- a/.ci_support/linux_ppc64le_variantdefault.yaml +++ b/.ci_support/linux_ppc64le_variantdefault.yaml @@ -1,9 +1,9 @@ cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: @@ -13,7 +13,7 @@ docker_image: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - linux-ppc64le variant: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 4ca7669d..ebfe1d36 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: @@ -11,7 +11,7 @@ cxx_compiler_version: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 9637643c..e6078770 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: @@ -11,7 +11,7 @@ cxx_compiler_version: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 99f225b5..010edb64 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,13 +1,13 @@ channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - vs2019 libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - win-64 variant: diff --git a/.gitignore b/.gitignore index c0029107..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfdb..beda247e 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef014..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/README.md b/README.md index b430bcde..07ce0522 100644 --- a/README.md +++ b/README.md @@ -99,14 +99,14 @@ Current release info Installing clangdev =================== -Installing `clangdev` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `clangdev` from the `conda-forge/label/llvm_rc` channel can be achieved by adding `conda-forge/label/llvm_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/llvm_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `clang, clang-17, clang-format, clang-format-17, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp17, libclang13, python-clang` can be installed with `conda`: +Once the `conda-forge/label/llvm_rc` channel has been enabled, `clang, clang-17, clang-format, clang-format-17, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp17, libclang13, python-clang` can be installed with `conda`: ``` conda install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang @@ -121,26 +121,26 @@ mamba install clang clang-17 clang-format clang-format-17 clang-tools clangdev c It is possible to list all of the versions of `clang` available on your platform with `conda`: ``` -conda search clang --channel conda-forge +conda search clang --channel conda-forge/label/llvm_rc ``` or with `mamba`: ``` -mamba search clang --channel conda-forge +mamba search clang --channel conda-forge/label/llvm_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search clang --channel conda-forge +mamba repoquery search clang --channel conda-forge/label/llvm_rc # List packages depending on `clang`: -mamba repoquery whoneeds clang --channel conda-forge +mamba repoquery whoneeds clang --channel conda-forge/label/llvm_rc # List dependencies of `clang`: -mamba repoquery depends clang --channel conda-forge +mamba repoquery depends clang --channel conda-forge/label/llvm_rc ``` From b2f681c2f1ed09f94fce5318df715b40c10d2e66 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 14:29:51 +0100 Subject: [PATCH 03/20] clangdev 18.1.0.rc1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index acbb0610..b0a1d924 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ -{% set version = "17.0.6" %} +{% set version = "18.1.0.rc1" %} {% set major_version = version.split(".")[0] %} -{% set build_number = 2 %} +{% set build_number = 0 %} {% set minor_aware_ext = major_version %} {% if version.split(".")[1] | int > 0 %} @@ -21,7 +21,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813 + sha256: eb1a2751408e4cbb08b152285b23dea00e4a1bc2cd28c0df90fe1ce699671154 patches: - patches/0001-Fix-sysroot-detection-for-linux.patch - patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch From bf3ad7b5e05970728693ebdd94f7c3a99823ffee Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 14:30:36 +0100 Subject: [PATCH 04/20] account for new versioning scheme --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b0a1d924..66d41398 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,7 +3,7 @@ {% set build_number = 0 %} {% set minor_aware_ext = major_version %} -{% if version.split(".")[1] | int > 0 %} +{% if version.split(".")[1] | int > 1 %} {% set minor_aware_ext = major_version ~ "." ~ version.split(".")[1] %} {% elif version.split(".")[-1].startswith("rc") %} {% set minor_aware_ext = major_version ~ "rc" %} From 7a8fc3897a2c881d22cc6fa10f43d16fab41a665 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Jan 2024 23:52:24 +0100 Subject: [PATCH 05/20] Re-apply "fix compiler stack on osx vs. rc-label" This reverts commit 82a41b8186b3088d6a118b6e3d7fba46333d8c35. --- conda-forge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index f9131c20..efb2d2c7 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -6,6 +6,9 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +# label/llvm_rc would overrule our default compiler stack on osx due to +# strict channel priority; disable for rc-phase; don't commit to main! +channel_priority: flexible conda_build: pkg_format: '2' conda_forge_output_validation: true From 3176e21e74b2073f29c65157187377a353ecab0f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 31 Jan 2024 06:56:57 +0100 Subject: [PATCH 06/20] fix use of renamed member function in patch --- .../patches/0001-Fix-sysroot-detection-for-linux.patch | 6 +++--- ...dd-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch | 10 +++++----- ...malizeProgramName-s-handling-of-dots-outside-.patch | 6 +++--- recipe/patches/0004-Set-VERSION-in-osx-as-well.patch | 6 +++--- .../patches/0005-Fix-crosscompiling-LLVM-tools.patch | 4 ++-- .../0006-Only-error-on-undefined-TARGET_OS_OSX.patch | 6 +++--- .../0007-set-libclang-SOVERSION-unconditionally.patch | 6 +++--- .../patches/0008-Make-PIE-default-on-macOS-too.patch | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/recipe/patches/0001-Fix-sysroot-detection-for-linux.patch b/recipe/patches/0001-Fix-sysroot-detection-for-linux.patch index bf800eda..ce1254e6 100644 --- a/recipe/patches/0001-Fix-sysroot-detection-for-linux.patch +++ b/recipe/patches/0001-Fix-sysroot-detection-for-linux.patch @@ -1,4 +1,4 @@ -From 9e7489a7585037b21c90dcf74d410c600cde56e2 Mon Sep 17 00:00:00 2001 +From a9db4f6f2feecd44d7ee7e65b5ec5919fbc80726 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 8 Apr 2019 16:32:17 -0500 Subject: [PATCH 1/8] Fix sysroot detection for linux @@ -8,10 +8,10 @@ Subject: [PATCH 1/8] Fix sysroot detection for linux 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp -index 1ba222bf83b1..ee361924b9e8 100644 +index 4300a2bdff17..401834493cb3 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp -@@ -394,18 +394,30 @@ std::string Linux::computeSysRoot() const { +@@ -398,18 +398,30 @@ std::string Linux::computeSysRoot() const { return std::string(); } diff --git a/recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch b/recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch index ab1b506f..5e51ca69 100644 --- a/recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch +++ b/recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch @@ -1,4 +1,4 @@ -From 790933939291c1d7204bc98c51da8727da871c81 Mon Sep 17 00:00:00 2001 +From 3d48e9d06b4c1af2995851c21856858579c05c8e Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 25 Aug 2018 09:20:04 -0500 Subject: [PATCH 2/8] clang: add conda specific env var CONDA_BUILD_SYSROOT @@ -9,10 +9,10 @@ Subject: [PATCH 2/8] clang: add conda specific env var CONDA_BUILD_SYSROOT 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp -index bdbdad9362e1..eef06f2c0a59 100644 +index 93cddf742d52..00d0466a5de2 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp -@@ -1348,6 +1348,11 @@ Compilation *Driver::BuildCompilation(ArrayRef ArgList) { +@@ -1352,6 +1352,11 @@ Compilation *Driver::BuildCompilation(ArrayRef ArgList) { CompilerPath = Split.second; } } @@ -25,7 +25,7 @@ index bdbdad9362e1..eef06f2c0a59 100644 SysRoot = A->getValue(); if (const Arg *A = Args.getLastArg(options::OPT__dyld_prefix_EQ)) diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp -index 41382d7cb3fc..3f2fab2b5bb9 100644 +index 2218db15013d..d05cfa38e4fb 100644 --- a/clang/lib/Lex/InitHeaderSearch.cpp +++ b/clang/lib/Lex/InitHeaderSearch.cpp @@ -24,6 +24,7 @@ @@ -36,7 +36,7 @@ index 41382d7cb3fc..3f2fab2b5bb9 100644 #include "llvm/Support/raw_ostream.h" #include "llvm/TargetParser/Triple.h" #include -@@ -241,7 +242,10 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, +@@ -210,7 +211,10 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, [[fallthrough]]; default: // FIXME: temporary hack: hard-coded paths. diff --git a/recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch b/recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch index 66f06a48..4cf503fd 100644 --- a/recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch +++ b/recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch @@ -1,4 +1,4 @@ -From 8256e78c1bdcd778994807548f410404d5485c00 Mon Sep 17 00:00:00 2001 +From 3f82e5619383f7fda54c0281e93bcce1d20678fb Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 30 Aug 2017 20:01:49 +0100 Subject: [PATCH 3/8] Fix normalizeProgramName()'s handling of dots outside of @@ -18,7 +18,7 @@ x86_64-apple-darwin13.4 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp -index 8dafc3d481c2..9b0010361dcc 100644 +index 388030592b48..f41635fc0021 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -55,6 +55,7 @@ using namespace driver; @@ -40,7 +40,7 @@ index 8dafc3d481c2..9b0010361dcc 100644 +StringRef program_name_stem(StringRef path) { + StringRef fname = llvm::sys::path::filename(path); + size_t pos = StringRef::npos; -+ if (fname.endswith_insensitive(".exe")) { ++ if (fname.ends_with_insensitive(".exe")) { + pos = fname.find_last_of('.'); + } + if (pos == StringRef::npos) diff --git a/recipe/patches/0004-Set-VERSION-in-osx-as-well.patch b/recipe/patches/0004-Set-VERSION-in-osx-as-well.patch index 1c343eb8..9e9fdeca 100644 --- a/recipe/patches/0004-Set-VERSION-in-osx-as-well.patch +++ b/recipe/patches/0004-Set-VERSION-in-osx-as-well.patch @@ -1,4 +1,4 @@ -From 7b341a2fa1318de4d5e7b8276eb294e704e74a77 Mon Sep 17 00:00:00 2001 +From 1a27f84c79925f6ec21821c1e51556383642a64a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 27 Jul 2019 11:55:23 -0500 Subject: [PATCH 4/8] Set VERSION in osx as well @@ -8,10 +8,10 @@ Subject: [PATCH 4/8] Set VERSION in osx as well 1 file changed, 5 insertions(+) diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt -index 4f23065a2472..da8a9740fab0 100644 +index b5b6d2807d71..3faabda0ea2a 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt -@@ -172,6 +172,11 @@ if(ENABLE_SHARED) +@@ -173,6 +173,11 @@ if(ENABLE_SHARED) set_property(TARGET libclang APPEND_STRING PROPERTY LINK_FLAGS ${LIBCLANG_LINK_FLAGS}) diff --git a/recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch b/recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch index 4035fc1b..da9bb4a2 100644 --- a/recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch +++ b/recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch @@ -1,4 +1,4 @@ -From ef7243e085ad067f7e5ad93ea080a8ec61cb69e9 Mon Sep 17 00:00:00 2001 +From e596167b3ff0ee9d6ab3e6a34d197272df1c82c2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 11 May 2021 15:08:13 +0200 Subject: [PATCH 5/8] Fix crosscompiling LLVM tools @@ -8,7 +8,7 @@ Subject: [PATCH 5/8] Fix crosscompiling LLVM tools 1 file changed, 10 insertions(+) diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt -index f7936d72e088..758f517f4d36 100644 +index 5f2b7f064da4..e7b4fe212d97 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -60,6 +60,16 @@ if(CLANG_BUILT_STANDALONE) diff --git a/recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch b/recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch index d0699c9a..33741a69 100644 --- a/recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch +++ b/recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch @@ -1,4 +1,4 @@ -From 151949fe6cc4930d480c0c7cdc27397b51575601 Mon Sep 17 00:00:00 2001 +From 8198ad10b33a39e70afac4f5e103ed1fb4242c38 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 11 May 2021 15:09:51 +0200 Subject: [PATCH 6/8] Only error on undefined TARGET_OS_OSX @@ -8,10 +8,10 @@ Subject: [PATCH 6/8] Only error on undefined TARGET_OS_OSX 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp -index 65bd6c6a7eb3..3276f9948e8e 100644 +index fae8ad1a958a..9e7510d12dc4 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp -@@ -1136,7 +1136,7 @@ DarwinClang::DarwinClang(const Driver &D, const llvm::Triple &Triple, +@@ -1149,7 +1149,7 @@ DarwinClang::DarwinClang(const Driver &D, const llvm::Triple &Triple, void DarwinClang::addClangWarningOptions(ArgStringList &CC1Args) const { // Always error about undefined 'TARGET_OS_*' macros. diff --git a/recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch b/recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch index d0e5cb03..18d8e174 100644 --- a/recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch +++ b/recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch @@ -1,4 +1,4 @@ -From f750bf6ea57c194e271925363489524f16178593 Mon Sep 17 00:00:00 2001 +From 664d3912fa7c4b93316df450929e7c0442f91fb7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 14 Apr 2022 11:57:00 +1100 Subject: [PATCH 7/8] set libclang SOVERSION unconditionally @@ -9,7 +9,7 @@ and avoid creating libclang with full version suffix 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt -index da8a9740fab0..dd4d43c56b43 100644 +index 3faabda0ea2a..53924bd65579 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -9,10 +9,7 @@ @@ -24,7 +24,7 @@ index da8a9740fab0..dd4d43c56b43 100644 # TODO: harmonize usage of LIBCLANG_SOVERSION / LIBCLANG_LIBARY_VERSION # below; this was added under time-pressure to avoid reverting the -@@ -199,10 +196,17 @@ if(ENABLE_SHARED) +@@ -211,10 +208,17 @@ if(ENABLE_SHARED) # Ensure that libclang.so gets rebuilt when the linker script changes. set_property(SOURCE ARCMigrate.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map) diff --git a/recipe/patches/0008-Make-PIE-default-on-macOS-too.patch b/recipe/patches/0008-Make-PIE-default-on-macOS-too.patch index 58441898..7b22bb3c 100644 --- a/recipe/patches/0008-Make-PIE-default-on-macOS-too.patch +++ b/recipe/patches/0008-Make-PIE-default-on-macOS-too.patch @@ -1,4 +1,4 @@ -From 024ac6cc93022e9f63f8b8a9971b20110b96eeb0 Mon Sep 17 00:00:00 2001 +From a2d6babd5f4ecde654c1b1117c031f4915c4f36b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 28 Dec 2023 19:32:19 +0530 Subject: [PATCH 8/8] Make PIE default on macOS too. @@ -9,10 +9,10 @@ This is the default for Linux from LLVM-15 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp -index 3276f9948e8e..509866f19052 100644 +index 9e7510d12dc4..6e62efd1fe42 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp -@@ -3017,7 +3017,7 @@ bool Darwin::SupportsEmbeddedBitcode() const { +@@ -3127,7 +3127,7 @@ bool Darwin::SupportsEmbeddedBitcode() const { bool MachO::isPICDefault() const { return true; } From 5762c9bf1c38c0bca1a900b8c3d280eea51d0b27 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 31 Jan 2024 13:06:37 +0100 Subject: [PATCH 07/20] during rc-phase, use newer deployment target --- recipe/conda_build_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a5ab7032..98b4c3eb 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,8 @@ +# RC-phase: taking packages from conda-forge/label/llvm_rc +# automatically pulls in libcxx >=17, which requires macOS. +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "10.13" # [osx and x86_64] + c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] From e09dcc42e77268b5f73668c03588eb53f2179191 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 31 Jan 2024 13:32:53 +0100 Subject: [PATCH 08/20] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.31.07.41.50 --- .ci_support/osx_64_.yaml | 2 +- README.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ebfe1d36..5d39064a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' channel_sources: - conda-forge/label/llvm_rc,conda-forge channel_targets: diff --git a/README.md b/README.md index 07ce0522..a169e442 100644 --- a/README.md +++ b/README.md @@ -84,15 +84,15 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang-green.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--17-green.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--18-green.svg)](https://anaconda.org/conda-forge/clang-18) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-18.svg)](https://anaconda.org/conda-forge/clang-18) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-18.svg)](https://anaconda.org/conda-forge/clang-18) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-18.svg)](https://anaconda.org/conda-forge/clang-18) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format-green.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--17-green.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--18-green.svg)](https://anaconda.org/conda-forge/clang-format-18) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-18.svg)](https://anaconda.org/conda-forge/clang-format-18) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-18.svg)](https://anaconda.org/conda-forge/clang-format-18) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-18.svg)](https://anaconda.org/conda-forge/clang-format-18) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--tools-green.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangdev-green.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx-green.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang-green.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp-green.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp17-green.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp18rc-green.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp18rc.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp18rc.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp18rc.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang13-green.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python--clang-green.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | @@ -106,16 +106,16 @@ conda config --add channels conda-forge/label/llvm_rc conda config --set channel_priority strict ``` -Once the `conda-forge/label/llvm_rc` channel has been enabled, `clang, clang-17, clang-format, clang-format-17, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp17, libclang13, python-clang` can be installed with `conda`: +Once the `conda-forge/label/llvm_rc` channel has been enabled, `clang, clang-18, clang-format, clang-format-18, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp18rc, libclang13, python-clang` can be installed with `conda`: ``` -conda install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang +conda install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18rc libclang13 python-clang ``` or with `mamba`: ``` -mamba install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang +mamba install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18rc libclang13 python-clang ``` It is possible to list all of the versions of `clang` available on your platform with `conda`: From 5f21dd40e2a1572ee74b26f9e89cc246ab8ec952 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 2 Mar 2024 10:05:42 +1100 Subject: [PATCH 09/20] clangdev 18.1.0.rc4 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 66d41398..303830cf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "18.1.0.rc1" %} +{% set version = "18.1.0.rc4" %} {% set major_version = version.split(".")[0] %} {% set build_number = 0 %} @@ -21,7 +21,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: eb1a2751408e4cbb08b152285b23dea00e4a1bc2cd28c0df90fe1ce699671154 + sha256: bc1d243472ee4868e20760c100049078343a89aa34549c69dbab389c68e0c473 patches: - patches/0001-Fix-sysroot-detection-for-linux.patch - patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch From 3322b339a71bbe5e2ec789c42a0ab69c25d90e9b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 2 Mar 2024 10:09:40 +1100 Subject: [PATCH 10/20] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.01.21.24.14 --- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- build-locally.py | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247e..9121002a 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --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:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..16daa698 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --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" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de9..f801cf46 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From ca289901f8342ac9d98041cabc8cc46316e65d41 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 2 Mar 2024 12:53:16 +1100 Subject: [PATCH 11/20] update to new SOVER pattern of minor number always being there --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 303830cf..12dcc628 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,16 +2,16 @@ {% set major_version = version.split(".")[0] %} {% set build_number = 0 %} -{% set minor_aware_ext = major_version %} -{% if version.split(".")[1] | int > 1 %} +# always includes minor as of v18, see https://github.com/llvm/llvm-project/issues/76273 {% set minor_aware_ext = major_version ~ "." ~ version.split(".")[1] %} -{% elif version.split(".")[-1].startswith("rc") %} -{% set minor_aware_ext = major_version ~ "rc" %} +{% if version.split(".")[-1].startswith("rc") %} +{% set minor_aware_ext = minor_aware_ext ~ "rc" %} {% elif version.split(".")[-1] == "dev0" %} -{% set minor_aware_ext = major_version ~ "git" %} +{% set minor_aware_ext = minor_aware_ext ~ "git" %} {% endif %} {% if libclang_soversion is not defined %} +# see https://github.com/llvm/llvm-project/blob/release/18.x/clang/tools/libclang/CMakeLists.txt {% set libclang_soversion = "13" %} {% endif %} From c234d98fb51d3336b24fd2cd93aad5691a314333 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 6 Mar 2024 06:48:09 +0000 Subject: [PATCH 12/20] updated v18.1.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index acbb0610..20490a38 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ -{% set version = "17.0.6" %} +{% set version = "18.1.0" %} {% set major_version = version.split(".")[0] %} -{% set build_number = 2 %} +{% set build_number = 0 %} {% set minor_aware_ext = major_version %} {% if version.split(".")[1] | int > 0 %} @@ -21,7 +21,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813 + sha256: 758a048046ac5024f86c868bb17c631500eed8f8d2677ae6a72ab7ad01602277 patches: - patches/0001-Fix-sysroot-detection-for-linux.patch - patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch From d64fe4bf62ca04c5b0ab56f5e2f1646a05b4da5b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 6 Mar 2024 06:49:12 +0000 Subject: [PATCH 13/20] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.06.02.49.17 --- .ci_support/linux_64_variantdefault.yaml | 2 +- .ci_support/linux_aarch64_variantdefault.yaml | 2 +- .ci_support/linux_ppc64le_variantdefault.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .gitignore | 13 ++++++++++++- .scripts/build_steps.sh | 12 +++--------- .scripts/run_docker_build.sh | 6 ++++++ .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- README.md | 12 ++++++------ build-locally.py | 5 +++-- 13 files changed, 41 insertions(+), 29 deletions(-) diff --git a/.ci_support/linux_64_variantdefault.yaml b/.ci_support/linux_64_variantdefault.yaml index 17e38006..03f0a4b2 100644 --- a/.ci_support/linux_64_variantdefault.yaml +++ b/.ci_support/linux_64_variantdefault.yaml @@ -13,7 +13,7 @@ docker_image: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - linux-64 variant: diff --git a/.ci_support/linux_aarch64_variantdefault.yaml b/.ci_support/linux_aarch64_variantdefault.yaml index 99046f91..dd53d5cd 100644 --- a/.ci_support/linux_aarch64_variantdefault.yaml +++ b/.ci_support/linux_aarch64_variantdefault.yaml @@ -17,7 +17,7 @@ docker_image: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - linux-aarch64 variant: diff --git a/.ci_support/linux_ppc64le_variantdefault.yaml b/.ci_support/linux_ppc64le_variantdefault.yaml index 5be45d37..92da96a0 100644 --- a/.ci_support/linux_ppc64le_variantdefault.yaml +++ b/.ci_support/linux_ppc64le_variantdefault.yaml @@ -13,7 +13,7 @@ docker_image: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - linux-ppc64le variant: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 4ca7669d..2877b701 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 9637643c..a4a6fa9b 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 99f225b5..0c0f681c 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ cxx_compiler: libclang_soversion: - '13' libxml2: -- '2.12' +- '2' target_platform: - win-64 variant: diff --git a/.gitignore b/.gitignore index c0029107..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfdb..9121002a 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -74,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --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:-}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef014..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..16daa698 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --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" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de9..f801cf46 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index b430bcde..c2bae3b9 100644 --- a/README.md +++ b/README.md @@ -84,15 +84,15 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang-green.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--17-green.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--18-green.svg)](https://anaconda.org/conda-forge/clang-18) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-18.svg)](https://anaconda.org/conda-forge/clang-18) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-18.svg)](https://anaconda.org/conda-forge/clang-18) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-18.svg)](https://anaconda.org/conda-forge/clang-18) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format-green.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--17-green.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--18-green.svg)](https://anaconda.org/conda-forge/clang-format-18) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-18.svg)](https://anaconda.org/conda-forge/clang-format-18) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-18.svg)](https://anaconda.org/conda-forge/clang-format-18) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-18.svg)](https://anaconda.org/conda-forge/clang-format-18) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--tools-green.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangdev-green.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx-green.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang-green.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp-green.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp17-green.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp18.1-green.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp18.1.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp18.1.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp18.1.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang13-green.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python--clang-green.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | @@ -106,16 +106,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `clang, clang-17, clang-format, clang-format-17, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp17, libclang13, python-clang` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `clang, clang-18, clang-format, clang-format-18, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp18.1, libclang13, python-clang` can be installed with `conda`: ``` -conda install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang +conda install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18.1 libclang13 python-clang ``` or with `mamba`: ``` -mamba install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang +mamba install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18.1 libclang13 python-clang ``` It is possible to list all of the versions of `clang` available on your platform with `conda`: diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From d0b2484af7122e01b74ad909d3e4ab49450e1066 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 6 Mar 2024 18:37:14 +1100 Subject: [PATCH 14/20] Revert "during rc-phase, use newer deployment target" This reverts commit 5762c9bf1c38c0bca1a900b8c3d280eea51d0b27. --- recipe/conda_build_config.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 98b4c3eb..a5ab7032 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,8 +1,3 @@ -# RC-phase: taking packages from conda-forge/label/llvm_rc -# automatically pulls in libcxx >=17, which requires macOS. -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.13" # [osx and x86_64] - c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] From e4fa62e800b7485790248a58837832a75ec62661 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 6 Mar 2024 18:37:39 +1100 Subject: [PATCH 15/20] remove rc-channels --- recipe/conda_build_config.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a5ab7032..3e99c76a 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,9 +12,3 @@ libclang_soversion: variant: - default - hcc # [linux] - -channel_targets: - - conda-forge llvm_rc - -channel_sources: - - conda-forge/label/llvm_rc,conda-forge From 4e983bda5429283d5fed5d98f1ed9a26fe3fa2d9 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Fri, 28 Jul 2023 03:33:02 +0200 Subject: [PATCH 16/20] Fix build string for clang with variants forward-port of a4eecef99886fd7efa5c1a6211aab2a80377d40a --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 17ea9fc1..5860b290 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -386,6 +386,9 @@ outputs: script: install_clang_symlinks.sh # [unix] script: install_clang_symlinks.bat # [win] build: + track_features: + - hcc # [variant=="hcc"] + string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: # the build fails if it doesn't find the following, but it's not used - libxml2 From c5f3863a5458bf0a399cc0938560de5c3355b721 Mon Sep 17 00:00:00 2001 From: Vincenzo Eduardo Padulano Date: Fri, 2 Feb 2024 10:57:26 +0100 Subject: [PATCH 17/20] Add root variant to track_features forward-port of fda59ddd5d446dd0f329614ef0686381d28174cc --- recipe/meta.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5860b290..3791eb8f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -92,6 +92,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: # the build fails if it doesn't find the following, but it's not used @@ -141,6 +142,7 @@ outputs: skip: true # [win] track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix] @@ -182,6 +184,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: # [unix] - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, max_pin="x.x") }} # [unix] @@ -225,6 +228,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: # note that the name (e.g. libclang13) does not necessarily @@ -288,6 +292,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} run_exports: # note that the name (e.g. libclang13) does not necessarily @@ -388,6 +393,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: # the build fails if it doesn't find the following, but it's not used @@ -420,6 +426,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: # the build fails if it doesn't find the following, but it's not used @@ -457,6 +464,7 @@ outputs: 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. skip: true # [win] @@ -503,6 +511,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: # the build fails if it doesn't find the following, but it's not used @@ -547,6 +556,7 @@ outputs: build: track_features: - hcc # [variant=="hcc"] + - root # [variant and variant.startswith("root_")] string: {{ variant }}_h{{ PKG_HASH }}_{{ build_number }} ignore_run_exports_from: # the build fails if it doesn't find the following, but it's not used From c5b729904e664a857b1ec23d1a5ecd37b418485c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 6 Mar 2024 18:54:13 +1100 Subject: [PATCH 18/20] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.06.07.36.15 --- .ci_support/linux_64_variantdefault.yaml | 4 ++-- .ci_support/linux_aarch64_variantdefault.yaml | 4 ++-- .ci_support/linux_ppc64le_variantdefault.yaml | 4 ++-- .ci_support/osx_64_.yaml | 6 ++--- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- README.md | 22 +++++++++---------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.ci_support/linux_64_variantdefault.yaml b/.ci_support/linux_64_variantdefault.yaml index 9fb67684..03f0a4b2 100644 --- a/.ci_support/linux_64_variantdefault.yaml +++ b/.ci_support/linux_64_variantdefault.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_variantdefault.yaml b/.ci_support/linux_aarch64_variantdefault.yaml index f3d6a157..dd53d5cd 100644 --- a/.ci_support/linux_aarch64_variantdefault.yaml +++ b/.ci_support/linux_aarch64_variantdefault.yaml @@ -5,9 +5,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_variantdefault.yaml b/.ci_support/linux_ppc64le_variantdefault.yaml index 01c7d4cc..92da96a0 100644 --- a/.ci_support/linux_ppc64le_variantdefault.yaml +++ b/.ci_support/linux_ppc64le_variantdefault.yaml @@ -1,9 +1,9 @@ cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5d39064a..2877b701 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '10.9' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index e6078770..a4a6fa9b 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 010edb64..0c0f681c 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - vs2019 libclang_soversion: diff --git a/README.md b/README.md index a169e442..c2bae3b9 100644 --- a/README.md +++ b/README.md @@ -92,55 +92,55 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx-green.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang-green.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp-green.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp18rc-green.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp18rc.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp18rc.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp18rc.svg)](https://anaconda.org/conda-forge/libclang-cpp18rc) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp18.1-green.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp18.1.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp18.1.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp18.1.svg)](https://anaconda.org/conda-forge/libclang-cpp18.1) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang13-green.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python--clang-green.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | Installing clangdev =================== -Installing `clangdev` from the `conda-forge/label/llvm_rc` channel can be achieved by adding `conda-forge/label/llvm_rc` to your channels with: +Installing `clangdev` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` -conda config --add channels conda-forge/label/llvm_rc +conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge/label/llvm_rc` channel has been enabled, `clang, clang-18, clang-format, clang-format-18, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp18rc, libclang13, python-clang` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `clang, clang-18, clang-format, clang-format-18, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp18.1, libclang13, python-clang` can be installed with `conda`: ``` -conda install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18rc libclang13 python-clang +conda install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18.1 libclang13 python-clang ``` or with `mamba`: ``` -mamba install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18rc libclang13 python-clang +mamba install clang clang-18 clang-format clang-format-18 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp18.1 libclang13 python-clang ``` It is possible to list all of the versions of `clang` available on your platform with `conda`: ``` -conda search clang --channel conda-forge/label/llvm_rc +conda search clang --channel conda-forge ``` or with `mamba`: ``` -mamba search clang --channel conda-forge/label/llvm_rc +mamba search clang --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search clang --channel conda-forge/label/llvm_rc +mamba repoquery search clang --channel conda-forge # List packages depending on `clang`: -mamba repoquery whoneeds clang --channel conda-forge/label/llvm_rc +mamba repoquery whoneeds clang --channel conda-forge # List dependencies of `clang`: -mamba repoquery depends clang --channel conda-forge/label/llvm_rc +mamba repoquery depends clang --channel conda-forge ``` From 5d1b332e00f9de4cfa4ee68b39641756fb500a5a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 6 Mar 2024 19:00:35 +1100 Subject: [PATCH 19/20] Revert "Re-apply "fix compiler stack on osx vs. rc-label"" This reverts commit 7a8fc3897a2c881d22cc6fa10f43d16fab41a665. --- conda-forge.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index efb2d2c7..f9131c20 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -6,9 +6,6 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 -# label/llvm_rc would overrule our default compiler stack on osx due to -# strict channel priority; disable for rc-phase; don't commit to main! -channel_priority: flexible conda_build: pkg_format: '2' conda_forge_output_validation: true From b7458f26d0d871f70626eda7dd1cdd8cdae390bc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 9 Mar 2024 05:08:07 +0000 Subject: [PATCH 20/20] updated v18.1.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3791eb8f..fea9dc84 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "18.1.0" %} +{% set version = "18.1.1" %} {% set major_version = version.split(".")[0] %} {% set build_number = 0 %} @@ -21,7 +21,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 758a048046ac5024f86c868bb17c631500eed8f8d2677ae6a72ab7ad01602277 + sha256: 8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad patches: - patches/0001-Fix-sysroot-detection-for-linux.patch - patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch