From 8480b42aae4c389f3c1c91afcf022d144b8e1ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 9 Feb 2026 19:41:25 +0100 Subject: [PATCH 1/2] Install `build-details.json` from shared library build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install `build-details.json` from shared library build rather than the static build, as the latter does not include the data needed to build extensions, and therefore it is not useful for cross-compilation. This is backported from #842, but unlike that PR it should not break anything. Signed-off-by: Michał Górny --- recipe/build_base.sh | 2 ++ recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index a376602ca..dd5c15555 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -399,6 +399,8 @@ SYSCONFIG=$(find ${_buildd_static}/$(cat ${_buildd_static}/pybuilddir.txt) -name cat ${SYSCONFIG} | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \ "${_FLAGS_REPLACE[@]}" \ > ${PREFIX}/lib/python${VERABI_NO_DBG}/$(basename ${SYSCONFIG}) +BUILD_DETAILS=${_buildd_shared}/$(cat ${_buildd_shared}/pybuilddir.txt)/build-details.json +cp ${BUILD_DETAILS} ${PREFIX}/lib/python${VERABI_NO_DBG}/ MAKEFILE=$(find ${PREFIX}/lib/python${VERABI_NO_DBG}/ -path "*config-*/Makefile" -print0) cp ${MAKEFILE} /tmp/Makefile-$$ cat /tmp/Makefile-$$ | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b8d25c787..523e01387 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 0 %} +{% set build_number = 1 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} From b3d75b278f388c394b0b70d12763b0cd57519ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 9 Feb 2026 19:43:34 +0100 Subject: [PATCH 2/2] Add missing `ripgrep` dependency for the test case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the `ripgrep` dependency that is used in the `prefix-replacement` test. Since it is missing, the test never really greps and therefore does not actually test. Signed-off-by: Michał Górny --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 523e01387..01ac0fa8c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -307,6 +307,7 @@ outputs: requires: - {{ stdlib('c') }} - {{ compiler('c') }} + - ripgrep commands: - VER=${PKG_VERSION%.*} # [not win] - VERABI=${VER} # [not win]