jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-style/python{2,3}-module: do not use custom build directory

Browse source 
There is no need to use a custom build directory for python{2,3}-only
modules.

This indirectly fixes our issues with packages that use distutils-extra.
This commit is contained in:
Alessio Sergi 2017-08-25 15:15:15 +02:00
parent 56941b2e99
commit 8742e48972
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/build-style/python2-module.sh
View file

@ -11,10 +11,9 @@ do_build() {
LDSHARED="${CC} -shared $LDFLAGS"
env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python2 setup.py \
build --build-base=build-${py2_ver} ${make_build_args}
LDFLAGS="$LDFLAGS" python2 setup.py build ${make_build_args}
else
python2 setup.py build --build-base=build-${py2_ver} ${make_build_args}
python2 setup.py build ${make_build_args}
fi
}
@ -28,10 +27,8 @@ do_install() {
env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python2 setup.py \
build --build-base=build-${py2_ver} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
else
python2 setup.py build --build-base=build-${py2_ver} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
python2 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
fi
}

9
common/build-style/python3-module.sh
View file

@ -11,10 +11,9 @@ do_build() {
LDSHARED="${CC} -shared $LDFLAGS"
env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python3 setup.py \
build --build-base=build-${py3_ver} ${make_build_args}
LDFLAGS="$LDFLAGS" python3 setup.py build ${make_build_args}
else
python3 setup.py build --build-base=build-${py3_ver} ${make_build_args}
python3 setup.py build ${make_build_args}
fi
}
@ -28,10 +27,8 @@ do_install() {
env CC="$CC" LDSHARED="$LDSHARED" \
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS" python3 setup.py \
build --build-base=build-${py3_ver} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
else
python3 setup.py build --build-base=build-${py3_ver} \
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
fi
}