diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 14260dc..baad776 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/.gitignore b/.gitignore index 179afe5..47b5408 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,8 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output +# Pixi's configuration +.pixi diff --git a/README.md b/README.md index b711b58..344f476 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/) diff --git a/conda-forge.yml b/conda-forge.yml index da64205..1864c41 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 diff --git a/recipe/build.sh b/recipe/build.sh index f4fb1a3..3636333 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -5,11 +5,18 @@ set -x export PYTHONNOUSERSITE=1 export LLVMLITE_USE_CMAKE=1 -export LLVMLITE_SHARED=1 +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 + # 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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cd80779..67aa02a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,10 +12,8 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 skip: true # [py<310] - script_env: - - PY_VCRUNTIME_REDIST requirements: build: @@ -29,13 +27,11 @@ requirements: host: - python - setuptools - - llvmdev 15.0.* - - llvm 15.0.* + - llvmdev 15.0.* # abstract pin for static lib + - llvmdev 15.0.7 *_5 # concrete pin for static lib - bot should update - zlib - - vs2015_runtime # [win] run: - python - - vs2015_runtime # [win] test: imports: @@ -59,3 +55,4 @@ extra: - marcelotrevisani - xhochy - mbargull + - beckermr