Skip to content

Commit dc22d85

Browse files
committed
Also use shared-lib build-details.json
Signed-off-by: Michał Górny <mgorny@quansight.com>
1 parent c237464 commit dc22d85

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

recipe/build_base.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,12 +395,15 @@ if [[ ${target_platform} =~ .*linux.* ]]; then
395395
ln -sf ${PREFIX}/lib/libpython${VERABI}${SHLIB_EXT}.1.0 ${PREFIX}/lib/libpython${VERABI}${SHLIB_EXT}
396396
fi
397397

398-
# Use sysconfigdata from shared build, as we want packages to prefer linking against the shared library.
399-
# Issue #565.
400-
SYSCONFIG=$(find ${_buildd_shared}/$(cat ${_buildd_shared}/pybuilddir.txt) -name "_sysconfigdata*.py" -print0)
398+
# Use sysconfigdata and build-details.json from the shared build, as we want packages to prefer
399+
# linking against the shared library. Issue #565.
400+
BUILD_DIR=$(< ${_buildd_shared}/pybuilddir.txt)
401+
SYSCONFIG=$(find ${_buildd_shared}/${BUILD_DIR} -name "_sysconfigdata*.py" -print0)
401402
cat ${SYSCONFIG} | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \
402403
"${_FLAGS_REPLACE[@]}" \
403404
> ${PREFIX}/lib/python${VERABI_NO_DBG}/$(basename ${SYSCONFIG})
405+
BUILD_DETAILS=${_buildd_shared}/${BUILD_DIR}/build-details.json
406+
cp ${BUILD_DETAILS} ${PREFIX}/lib/python${VERABI_NO_DBG}/
404407
MAKEFILE=$(find ${PREFIX}/lib/python${VERABI_NO_DBG}/ -path "*config-*/Makefile" -print0)
405408
cp ${MAKEFILE} /tmp/Makefile-$$
406409
cat /tmp/Makefile-$$ | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \

0 commit comments

Comments
 (0)