wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

python{,3}{,-tkinter}: keep XBPS_ARCH variable

Browse source 
From commit cf6e6f14d3, (wrappers/uname: report correct machine type
on ethereal, 2020-02-10), uname wrapper has been updated to report
correct machine type in ethereal mode by replace its original machine
type by value reported by $XBPS_ARCH.

This effectively breaks python{,3}{,-tkinter}'s cross compile because
we reset all environment variable to configure for the host build.

Keep those environment variable.
This commit is contained in:
Đoàn Trần Công Danh 2020-03-23 17:24:34 +07:00 • committed by Jürgen Buchmüller
parent eac501ea84
commit 75e4976dde
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/python-tkinter/template
View file

@ -35,8 +35,8 @@ do_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
mkdir -p host-build mkdir -p host-build
cd host-build cd host-build
env -i PATH=$PATH ../configure env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
env -i PATH=$PATH make ${makejobs} python env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
mkdir -p ../hostpython mkdir -p ../hostpython
mv python ../hostpython mv python ../hostpython
cd .. cd ..

4
srcpkgs/python/template
View file

@ -40,8 +40,8 @@ do_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
mkdir -p host-build mkdir -p host-build
cd host-build cd host-build
env -i PATH=$PATH ../configure env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
env -i PATH=$PATH make ${makejobs} python env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
mkdir -p ../hostpython mkdir -p ../hostpython
mv python ../hostpython mv python ../hostpython
cd .. cd ..

4
srcpkgs/python3-tkinter/template
View file

@ -35,8 +35,8 @@ do_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
mkdir -p host-build mkdir -p host-build
cd host-build cd host-build
env -i PATH=$PATH CFLAGS=-Os ../configure env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH CFLAGS=-Os ../configure
env -i PATH=$PATH make ${makejobs} python env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
mkdir -p ../hostpython mkdir -p ../hostpython
mv python ../hostpython mv python ../hostpython
cd .. cd ..

9
srcpkgs/python3/template
View file

@ -28,17 +28,18 @@ alternatives="
pre_configure() { pre_configure() {
# Ensure that internal copies of expat and libffi are not used # Ensure that internal copies of expat and libffi are not used
rm -r Modules/expat rm -rf Modules/expat
rm -r Modules/_ctypes/{darwin,libffi}* rm -rf Modules/_ctypes/{darwin,libffi}*
} }
do_configure() { do_configure() {
local _args local _args
unset GCC CC CXX CPP LD AR AS RANLIB unset GCC CC CXX CPP LD AR AS RANLIB
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
mkdir -p host-build mkdir -p host-build
cd host-build cd host-build
env -i PATH=$PATH CFLAGS=-Os ../configure env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH CFLAGS=-Os ../configure
env -i PATH=$PATH make ${makejobs} python env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
mkdir -p ../hostpython mkdir -p ../hostpython
mv python ../hostpython mv python ../hostpython
cd .. cd ..