From 67353febb46392413f3e3cc6d37183c7ede3975a Mon Sep 17 00:00:00 2001 From: Timo Strunk Date: Thu, 13 Feb 2025 09:44:53 +0100 Subject: [PATCH 01/11] Switched to static linking of llvm for linux-64 and osx-* --- recipe/build.sh | 6 +++++- recipe/meta.yaml | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index f4fb1a37..01309c9d 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -5,7 +5,11 @@ set -x export PYTHONNOUSERSITE=1 export LLVMLITE_USE_CMAKE=1 -export LLVMLITE_SHARED=1 +if [[ "${target_platform}" == "linux-ppc64le" ]]; then + export LLVMLITE_SHARED=1 +else + export LLVMLITE_SHARED=0 +fi if [[ "${target_platform}" == osx-* ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cd807798..92067478 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,10 +12,12 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 skip: true # [py<310] script_env: - PY_VCRUNTIME_REDIST + ignore_run_exports: + - libllvm15 # [unix and not ppc64le] requirements: build: From 2a97a9af0aea42badbd79f44a498d898e30fb9cf Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:02:10 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.4, and conda-forge-pinning 2025.02.12.20.08.11 --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 179afe55..bb385366 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output From e8b11762953f08f65818e8d0dd64dd0501abdc74 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 27 Feb 2025 08:05:43 -0600 Subject: [PATCH 03/11] cleanup --- recipe/meta.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92067478..7eb0630c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,10 +14,6 @@ source: build: number: 1 skip: true # [py<310] - script_env: - - PY_VCRUNTIME_REDIST - ignore_run_exports: - - libllvm15 # [unix and not ppc64le] requirements: build: @@ -32,12 +28,9 @@ requirements: - python - setuptools - llvmdev 15.0.* - - llvm 15.0.* - zlib - - vs2015_runtime # [win] run: - python - - vs2015_runtime # [win] test: imports: From 230e541898a5888cf666fb67d5e64e4d0fb139fa Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 27 Feb 2025 08:11:54 -0600 Subject: [PATCH 04/11] Update recipe/meta.yaml --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7eb0630c..6c9e4838 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,8 @@ requirements: host: - python - setuptools - - llvmdev 15.0.* + - llvmdev 15.0.* # abstract pin for static lib + - llvmdev 15.0.7 *_5 # concrete pin for static lib - bot should update - zlib run: - python From df55c8e91a6301c9920e3cea79f1a55c994911ff Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 27 Feb 2025 08:12:45 -0600 Subject: [PATCH 05/11] add me too --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6c9e4838..67aa02a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,3 +55,4 @@ extra: - marcelotrevisani - xhochy - mbargull + - beckermr From e7cf0ea126fea9d29e6a9741a8c29165ba042b09 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 27 Feb 2025 08:14:48 -0600 Subject: [PATCH 06/11] Update conda-forge.yml --- conda-forge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index da642050..1864c415 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,7 @@ bot: + update_static_libs: true abi_migration_branches: - - rc + - rc build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 From 9d9ae569b75c599be7ffde7537ae125340f4b09f Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:14:53 +0000 Subject: [PATCH 07/11] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.4, and conda-forge-pinning 2025.02.27.07.39.47 --- .github/CODEOWNERS | 2 +- README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 14260dc0..baad776e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @jakirkham @marcelotrevisani @mbargull @souravsingh @xhochy \ No newline at end of file +* @beckermr @jakirkham @marcelotrevisani @mbargull @souravsingh @xhochy \ No newline at end of file diff --git a/README.md b/README.md index b711b586..344f476b 100644 --- a/README.md +++ b/README.md @@ -327,6 +327,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@beckermr](https://github.com/beckermr/) * [@jakirkham](https://github.com/jakirkham/) * [@marcelotrevisani](https://github.com/marcelotrevisani/) * [@mbargull](https://github.com/mbargull/) From af6574ae5458a21bf9cc6f9f3425a4040b83f4d9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 27 Feb 2025 08:56:01 -0600 Subject: [PATCH 08/11] Update build.sh --- recipe/build.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 01309c9d..9c43fc42 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -5,11 +5,7 @@ set -x export PYTHONNOUSERSITE=1 export LLVMLITE_USE_CMAKE=1 -if [[ "${target_platform}" == "linux-ppc64le" ]]; then - export LLVMLITE_SHARED=1 -else - export LLVMLITE_SHARED=0 -fi +export LLVMLITE_SHARED=0 if [[ "${target_platform}" == osx-* ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk From 03326d4ac9eb494d308e4fdb4d52e9412143f6ab Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 27 Feb 2025 09:11:37 -0600 Subject: [PATCH 09/11] Update build.sh --- recipe/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 9c43fc42..71628d11 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -10,6 +10,8 @@ export LLVMLITE_SHARED=0 if [[ "${target_platform}" == osx-* ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" +elif [[ "${target_platform}" == linux-ppc64le ]]; then + CXXFLAGS="${CXXFLAGS} -fplt" fi $PYTHON setup.py build --force From c6f123a5177fe09208ccce90d55e4e6c5c7d46e2 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 21 Mar 2025 19:21:25 -0700 Subject: [PATCH 10/11] Match common `-fno-plt` flag removal on PPC --- recipe/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 71628d11..3636333f 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -11,7 +11,12 @@ if [[ "${target_platform}" == osx-* ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" elif [[ "${target_platform}" == linux-ppc64le ]]; then - CXXFLAGS="${CXXFLAGS} -fplt" + # Taken from llvmdev's recipe + # https://github.com/conda-forge/llvmdev-feedstock/blob/8c2c0f2db9db1fdf12289381dcee4e2d9a2e5fec/recipe/build.sh#L29-L33 + # disable `-fno-plt` due to some GCC bug causing linker errors, see + # https://github.com/llvm/llvm-project/issues/51205 + CFLAGS="$(echo $CFLAGS | sed 's/-fno-plt //g')" + CXXFLAGS="$(echo $CXXFLAGS | sed 's/-fno-plt //g')" fi $PYTHON setup.py build --force From 60ed7d3b14ca49f52c63aaf220b12d2769b5a6b9 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 22 Mar 2025 02:25:20 +0000 Subject: [PATCH 11/11] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.47.0, and conda-forge-pinning 2025.03.21.21.56.39 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index bb385366..47b5408a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ # Rattler-build's artifacts are in `output` when not specifying anything. /output +# Pixi's configuration +.pixi