From 00a3dfec44cf7fd3428f99612da4a4af9956984e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 19 Jul 2023 16:56:15 +0200 Subject: [PATCH 01/13] Revert "remove rc-channels" This reverts commit ec6a829ef8974e759d0c554858591a79d9e70c60. --- 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 9de62ab..afad992 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,3 +2,9 @@ c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] - clang_bootstrap # [osx] + +channel_targets: + - conda-forge llvm_rc + +channel_sources: + - conda-forge/label/llvm_rc,conda-forge From d846c73bf9c058a40794567f5a5de82e953c2105 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 19 Jul 2023 16:56:36 +0200 Subject: [PATCH 02/13] build from upstream main branch --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a42b959..12b4914 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,12 +1,14 @@ -{% set version = "16.0.6" %} +{% set version = "17.0.0.dev0" %} package: name: lld version: {{ version }} 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: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e + git_url: https://github.com/llvm/llvm-project.git + git_rev: a4f4d82c35b80b681687b545200456e79a82d9c2 + # url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz + # sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 7bfc41a96e8071f16ec92525216a895cdef02d44 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 19 Jul 2023 16:58:07 +0200 Subject: [PATCH 03/13] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.18.22.54.11 --- .azure-pipelines/azure-pipelines-win.yml | 5 ++++- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- .scripts/run_osx_build.sh | 10 +++++----- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a96a72..d66c7d1 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -60,7 +60,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 06d24a8..ce8902d 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,9 +5,9 @@ c_compiler_version: 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: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 2b2c0af..902c564 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -9,9 +9,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: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index c1260fd..f29b9c0 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,9 +5,9 @@ c_compiler_version: 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: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c50e8de..258a051 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '15' 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: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 0ee9b2e..1f690c5 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '15' 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: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 68f49b6..46e00c9 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_compiler: - vs2019 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - vs2019 libxml2: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..3969edf 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml From fb3f379006f1cd0e0060469521c65e863b43789d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 21 Jul 2023 14:28:28 +0200 Subject: [PATCH 04/13] retrigger CI From 57c1b8be2c734b0011d25a44a8467c8b274cb7a2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 29 Jul 2023 18:32:30 +1100 Subject: [PATCH 05/13] lld 17.0.0.rc1 --- recipe/meta.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 12b4914..f674e34 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,14 +1,12 @@ -{% set version = "17.0.0.dev0" %} +{% set version = "17.0.0.rc1" %} package: name: lld version: {{ version }} source: - git_url: https://github.com/llvm/llvm-project.git - git_rev: a4f4d82c35b80b681687b545200456e79a82d9c2 - # url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - # sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e + url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz + sha256: 01b80625c131b8281dcf76a4e6395d10f45835c60e27357c92abf5a98c9a0337 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 5a997f946fd022c2ff610a69a9c8a936230a9ce3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 29 Jul 2023 18:33:51 +1100 Subject: [PATCH 06/13] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.07.28.20.44.13 --- .azure-pipelines/azure-pipelines-linux.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2e0430f..e8d482f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -23,11 +23,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | From 3462496dafd0bec1a355482860c9f75f43f6a5c4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 10 Aug 2023 09:41:53 +1100 Subject: [PATCH 07/13] lld 17.0.0.rc2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f674e34..9724f1f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0.rc1" %} +{% set version = "17.0.0.rc2" %} package: name: lld @@ -6,7 +6,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: 01b80625c131b8281dcf76a4e6395d10f45835c60e27357c92abf5a98c9a0337 + sha256: 71c018a6c0d3f7ccfe66a8ea7a68281a256fcd3bc35099e61616a92dcbbf0859 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From 8e40e730b9b3269c8f9172ddeb871b5e60fa6932 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 10 Aug 2023 12:28:17 +1100 Subject: [PATCH 08/13] set LLVM_ENABLE_LIBCXX=ON on osx --- recipe/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 47944f8..457264c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -5,6 +5,10 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then CMAKE_ARGS="$CMAKE_ARGS -DLLVM_CONFIG_PATH=$BUILD_PREFIX/bin/llvm-config -DLLVM_TABLEGEN_EXE=$BUILD_PREFIX/bin/llvm-tblgen" fi +if [[ "${target_platform}" == osx-* ]]; then + CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_LIBCXX=ON" +fi + cmake -G Ninja \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_INSTALL_LIBDIR=$PREFIX/lib \ From bb86f32776775e55b4b76e9dd565632736c9df9d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 23 Aug 2023 22:13:17 +1100 Subject: [PATCH 09/13] lld 17.0.0.rc3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9724f1f..6b41d67 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0.rc2" %} +{% set version = "17.0.0.rc3" %} package: name: lld @@ -6,7 +6,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: 71c018a6c0d3f7ccfe66a8ea7a68281a256fcd3bc35099e61616a92dcbbf0859 + sha256: 60493f4e974fcca7b739aea4901af2d957b0eaea34b42815359be59cf6c88fa2 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From f127a0d36d0d6257b2157a19597c7b69b99d2cbe Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 20:10:31 +1100 Subject: [PATCH 10/13] remove rc-channel sources & targets --- 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 afad992..9de62ab 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,9 +2,3 @@ c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] - clang_bootstrap # [osx] - -channel_targets: - - conda-forge llvm_rc - -channel_sources: - - conda-forge/label/llvm_rc,conda-forge From 29d3e9537cab08621a58ae270fe6b9585656219f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 20:10:58 +1100 Subject: [PATCH 11/13] lld 17.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6b41d67..d2d23cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0.rc3" %} +{% set version = "17.0.0" %} package: name: lld @@ -6,7 +6,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: 60493f4e974fcca7b739aea4901af2d957b0eaea34b42815359be59cf6c88fa2 + sha256: e71ba1f238c47d6cc6a747ce3a407bfd0c3bf81cd7e10ba88b45c47f740efcbd patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch From a16a0efc3c6a45fe515cae6baa140f13eea212df Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 19 Sep 2023 20:12:27 +1100 Subject: [PATCH 12/13] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and conda-forge-pinning 2023.09.19.07.30.00 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/migrations/libxml2211.yaml | 7 ------- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- 7 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 .ci_support/migrations/libxml2211.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index ce8902d..06d24a8 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,9 +5,9 @@ c_compiler_version: 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_.yaml b/.ci_support/linux_aarch64_.yaml index 902c564..2b2c0af 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -9,9 +9,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_.yaml b/.ci_support/linux_ppc64le_.yaml index f29b9c0..c1260fd 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,9 +5,9 @@ c_compiler_version: 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/migrations/libxml2211.yaml b/.ci_support/migrations/libxml2211.yaml deleted file mode 100644 index 9bce314..0000000 --- a/.ci_support/migrations/libxml2211.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libxml2: -- '2.11' -migrator_ts: 1684203491.9767957 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 258a051..c50e8de 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '15' 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 1f690c5..0ee9b2e 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,9 +5,9 @@ c_compiler: c_compiler_version: - '15' 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 46e00c9..68f49b6 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,9 +1,9 @@ c_compiler: - vs2019 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - vs2019 libxml2: From b05c333c50c218844c42c50fb996f2baa215bd66 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Fri, 22 Sep 2023 19:37:31 +1100 Subject: [PATCH 13/13] lld 17.0.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d2d23cc..71e6d7e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0" %} +{% set version = "17.0.1" %} package: name: lld @@ -6,7 +6,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: e71ba1f238c47d6cc6a747ce3a407bfd0c3bf81cd7e10ba88b45c47f740efcbd + sha256: b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9 patches: - patches/0001-point-header-inclusion-in-lld-MachO-CMakeLists.txt-t.patch