From 8742e48972200d9231b126424bf9b4d9ad9b2023 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 25 Aug 2017 15:15:15 +0200 Subject: [PATCH] build-style/python{2,3}-module: do not use custom build directory 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. --- common/build-style/python2-module.sh | 9 +++------ common/build-style/python3-module.sh | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/common/build-style/python2-module.sh b/common/build-style/python2-module.sh index 62c5fdd592..0a31b157df 100644 --- a/common/build-style/python2-module.sh +++ b/common/build-style/python2-module.sh @@ -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 } diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh index df2bd90156..9cae520b1d 100644 --- a/common/build-style/python3-module.sh +++ b/common/build-style/python3-module.sh @@ -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 }