From 2014e03dacd32a6ed3596d3da2b6a23cdda1c05d Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Thu, 12 Jan 2017 12:27:12 +0100
Subject: [PATCH] Revert "common/buildstyle/python*: build dir can be used as
 python identifier"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a02132b2ae0c759652f9842de1b1bedba24939d6.

Actually, the issue with packages using python-distutils-extra hasn't
been solved. On the contrary, python build style now generates malformed
packages, e.g., gufw:

+-- usr
    +-- lib
    |   +-- python3.5
    |       +-- site-packages
    |           +-- build3_5
    |           |   +-- lib
    |           |       +-- gufw
    |           |           +-- __init__.py
    |           |           +-- gufw
    |           |           +-- gufw.py
    |           +-- gufw
    |           |   +-- __init__.py
    |           |   +-- gufw
    |           |   +-- gufw.py
    |           +-- gufw-17.04.1-py3.5.egg-info

I don't have a clean solution handy right now, but that obviously isn't.
---
 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 89500c3e60c..57ec8c73831 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 da6b04b6c10..62c5fdd592c 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 92b2ae6991d..df2bd901564 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
 }