diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh index ff8f107745..15cf7577ad 100644 --- a/common/build-style/python-module.sh +++ b/common/build-style/python-module.sh @@ -10,13 +10,23 @@ do_build() { if [ -n "$CROSS_BUILD" ]; then CFLAGS="$tmp_cflags" LDFLAGS="$tmp_ldflags" + ADDENV= PYPREFIX="$XBPS_CROSS_BASE" CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include" LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib" CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS" - env CC="$CC" LDSHARED="$LDSHARED" \ + case $pyver in + 3.*) + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + f=${f##*/} + _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done + ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}" + ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME"" + esac + env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python${pyver} setup.py \ build --build-base=build-${pyver} ${make_build_args} @@ -50,12 +60,22 @@ do_install() { for pyver in $python_versions; do if [ -n "$CROSS_BUILD" ]; then + ADDENV= PYPREFIX="$XBPS_CROSS_BASE" CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include" LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib" CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS" - env CC="$CC" LDSHARED="$LDSHARED" \ + case $pyver in + 3.*) + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + f=${f##*/} + _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done + ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}" + ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME"" + esac + env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python${pyver} setup.py \ build --build-base=build-${pyver} \ diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh index 8bf3433ddd..db56feb5e0 100644 --- a/common/build-style/python3-module.sh +++ b/common/build-style/python3-module.sh @@ -9,8 +9,14 @@ do_build() { LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS" + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + f=${f##*/} + _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ + PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ + _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ LDFLAGS="$LDFLAGS" python3 setup.py build ${make_build_args} else python3 setup.py build ${make_build_args} @@ -36,8 +42,14 @@ do_install() { LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS" + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + f=${f##*/} + _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ + PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ + _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ LDFLAGS="$LDFLAGS" python3 setup.py \ install --prefix=/usr --root=${DESTDIR} ${make_install_args} else