diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b8..8a96a72e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a63..a6b09f6b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb5..bb00584b 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 2c1d8cda..9d60cd42 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About llvm-package -================== +About llvm-package-feedstock +============================ + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/llvmdev-feedstock/blob/main/LICENSE.txt) Home: http://llvm.org/ Package license: Apache-2.0 WITH LLVM-exception -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/llvmdev-feedstock/blob/main/LICENSE.txt) - Summary: Development headers and libraries for LLVM Development: https://github.com/llvm/llvm-project diff --git a/recipe/bld.bat b/recipe/bld.bat index 131d358e..7c9992c7 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -20,7 +20,7 @@ cmake -G "Ninja" ^ -DLLVM_INCLUDE_BENCHMARKS=OFF ^ -DLLVM_INCLUDE_DOCS=OFF ^ -DLLVM_INCLUDE_EXAMPLES=OFF ^ - -DLLVM_INCLUDE_TESTS=OFF ^ + -DLLVM_INCLUDE_TESTS=ON ^ -DLLVM_INCLUDE_UTILS=ON ^ -DLLVM_INSTALL_UTILS=ON ^ -DLLVM_UTILS_INSTALL_DIR=libexec\llvm ^ @@ -37,4 +37,4 @@ REM bin\opt -S -vector-library=SVML -mcpu=haswell -O3 %RECIPE_DIR%\numba-3016.ll REM if %ERRORLEVEL% neq 0 exit 1 cd ..\llvm\test -..\..\build\bin\llvm-lit.py -vv Transforms ExecutionEngine Analysis CodeGen/X86 +python ..\..\build\bin\llvm-lit.py -vv Transforms ExecutionEngine Analysis CodeGen/X86 diff --git a/recipe/build.sh b/recipe/build.sh index 797f1062..06a377b8 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -70,5 +70,5 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" != "1" ]]; then ninja -j${CPU_COUNT} check-llvm cd ../llvm/test - ../../build/bin/llvm-lit -vv Transforms ExecutionEngine Analysis CodeGen/X86 + python ../../build/bin/llvm-lit -vv Transforms ExecutionEngine Analysis CodeGen/X86 fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3db3e0de..1cdb64b7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ source: - patches/no-windows-symlinks.patch build: - number: 0 + number: 1 merge_build_host: false requirements: @@ -50,7 +50,9 @@ outputs: - cmake - ninja - python >=3 + - libcxx {{ cxx_compiler_version }} # [osx] host: + - libcxx {{ cxx_compiler_version }} # [osx] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} - {{ pin_subpackage("llvm-tools", exact=True) }} - libxml2 @@ -86,8 +88,9 @@ outputs: - ninja # [not win] - cmake # [not win] - python >=3 # [not win] + - libcxx {{ cxx_compiler_version }} # [osx] host: - - libcxx >={{ cxx_compiler_version }} # [osx] + - libcxx {{ cxx_compiler_version }} # [osx] - libxml2 - zlib - zstd # [build_platform == target_platform] @@ -130,7 +133,9 @@ outputs: - cmake - ninja - python >=3 + - libcxx {{ cxx_compiler_version }} # [osx] host: + - libcxx {{ cxx_compiler_version }} # [osx] - {{ pin_subpackage("libllvm" + major_ver, exact=True) }} - libxml2 - zlib