From a02132b2ae0c759652f9842de1b1bedba24939d6 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 5 Jan 2017 11:15:46 +0100 Subject: [PATCH] common/buildstyle/python*: build dir can be used as python identifier in order to make gufw installation process work, it includes itself while installing. this raise the need that the build directory needs to be a valid python identifier too. this commit solves this issue. --- common/build-style/python-module.sh | 8 ++++---- common/build-style/python2-module.sh | 8 ++++---- common/build-style/python3-module.sh | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh index 57ec8c7383..89500c3e60 100644 --- a/common/build-style/python-module.sh +++ b/common/build-style/python-module.sh @@ -19,9 +19,9 @@ do_build() { env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python${pyver} setup.py \ - build --build-base=build-${pyver} ${make_build_args} + build --build-base=build${pyver//./_} ${make_build_args} else - python${pyver} setup.py build --build-base=build-${pyver} ${make_build_args} + python${pyver} setup.py build --build-base=build${pyver//./_} ${make_build_args} fi done } @@ -43,10 +43,10 @@ do_install() { env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python${pyver} setup.py \ - build --build-base=build-${pyver} \ + build --build-base=build${pyver//./_} \ install --prefix=/usr --root=${DESTDIR} ${make_install_args} else - python${pyver} setup.py build --build-base=build-${pyver} \ + python${pyver} setup.py build --build-base=build${pyver//./_} \ install --prefix=/usr --root=${DESTDIR} ${make_install_args} fi diff --git a/common/build-style/python2-module.sh b/common/build-style/python2-module.sh index 62c5fdd592..da6b04b6c1 100644 --- a/common/build-style/python2-module.sh +++ b/common/build-style/python2-module.sh @@ -12,9 +12,9 @@ do_build() { env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python2 setup.py \ - build --build-base=build-${py2_ver} ${make_build_args} + build --build-base=build${py2_ver//./_} ${make_build_args} else - python2 setup.py build --build-base=build-${py2_ver} ${make_build_args} + python2 setup.py build --build-base=build${py2_ver}//./_ ${make_build_args} fi } @@ -28,10 +28,10 @@ do_install() { env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python2 setup.py \ - build --build-base=build-${py2_ver} \ + build --build-base=build${py2_ver//./_} \ install --prefix=/usr --root=${DESTDIR} ${make_install_args} else - python2 setup.py build --build-base=build-${py2_ver} \ + python2 setup.py build --build-base=build${py2_ver//./_} \ 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..92b2ae6991 100644 --- a/common/build-style/python3-module.sh +++ b/common/build-style/python3-module.sh @@ -12,9 +12,9 @@ do_build() { env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python3 setup.py \ - build --build-base=build-${py3_ver} ${make_build_args} + build --build-base=build${py3_ver//./_} ${make_build_args} else - python3 setup.py build --build-base=build-${py3_ver} ${make_build_args} + python3 setup.py build --build-base=build${py3_ver//./_} ${make_build_args} fi } @@ -28,10 +28,10 @@ do_install() { env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" python3 setup.py \ - build --build-base=build-${py3_ver} \ + build --build-base=build${py3_ver//./_} \ install --prefix=/usr --root=${DESTDIR} ${make_install_args} else - python3 setup.py build --build-base=build-${py3_ver} \ + python3 setup.py build --build-base=build${py3_ver//./_} \ install --prefix=/usr --root=${DESTDIR} ${make_install_args} fi }