Skip to content

Commit 02184ce

Browse files
[3.14] Install build-details.json from shared library build (#858)
automerged PR by conda-forge/automerge-action
2 parents 1326937 + b3d75b2 commit 02184ce

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

recipe/build_base.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@ SYSCONFIG=$(find ${_buildd_static}/$(cat ${_buildd_static}/pybuilddir.txt) -name
399399
cat ${SYSCONFIG} | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \
400400
"${_FLAGS_REPLACE[@]}" \
401401
> ${PREFIX}/lib/python${VERABI_NO_DBG}/$(basename ${SYSCONFIG})
402+
BUILD_DETAILS=${_buildd_shared}/$(cat ${_buildd_shared}/pybuilddir.txt)/build-details.json
403+
cp ${BUILD_DETAILS} ${PREFIX}/lib/python${VERABI_NO_DBG}/
402404
MAKEFILE=$(find ${PREFIX}/lib/python${VERABI_NO_DBG}/ -path "*config-*/Makefile" -print0)
403405
cp ${MAKEFILE} /tmp/Makefile-$$
404406
cat /tmp/Makefile-$$ | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \

recipe/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
55
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
66
{% set ver3nd = ''.join(version.split('.')[0:3]) %}
7-
{% set build_number = 0 %}
7+
{% set build_number = 1 %}
88

99
# this makes the linter happy
1010
{% set channel_targets = channel_targets or 'conda-forge main' %}
@@ -307,6 +307,7 @@ outputs:
307307
requires:
308308
- {{ stdlib('c') }}
309309
- {{ compiler('c') }}
310+
- ripgrep
310311
commands:
311312
- VER=${PKG_VERSION%.*} # [not win]
312313
- VERABI=${VER} # [not win]

0 commit comments

Comments
 (0)