xbps-src: add support for python3 pkgs

- python_module build style now builds modules for python2/3 by default - new python2_module and python3_module build styles for building python2-only and python3-only packages respectively - no more python_versions - no need to define pycompile_version for Python modules anymore (still needed for non-Python modules though) - Python version and paths are now guessed automatically and a set of useful variables can now be used in templates - #!/usr/bin/python2 and #!/usr/bin/python3 are now the default shebangs - /usr/bin/foo2 and /usr/bin/foo3 are now the default names for bin scripts (for use with alternatives)
2016-10-16 16:46:46 +02:00
parent c90131095c
commit 4e6576e7a4
8 changed files with 149 additions and 57 deletions
--- a/common/build-style/python-module.sh
+++ b/common/build-style/python-module.sh
@@ -3,7 +3,7 @@
 #

 do_build() {
-	: ${python_versions:=2.7}
+	: ${python_versions:="2.7 $py3_ver"}
 	local pyver= pysufx=

 	for pyver in $python_versions; do
@@ -27,7 +27,7 @@ do_build() {
 }

 do_install() {
-	: ${python_versions:=2.7}
+	: ${python_versions:="2.7 $py3_ver"}
 	local pyver= pysufx=

 	for pyver in $python_versions; do
@@ -51,13 +51,11 @@ do_install() {
 		fi

 		# Rename unversioned scripts to avoid name conflicts.
-		if [ "$python_versions" != "2.7" -a "$python_versions" != "${python_versions#2.7}" ]; then
-			if [ -d ${DESTDIR}/usr/bin ]; then
-				find ${DESTDIR}/usr/bin -type f ! -name "*[[:digit:]]\.[[:digit:]]" | while IFS= read -r f _; do
-					mv "${f}" "${f}${pyver}"
-					echo "[python-module] Unversioned script renamed to '${f#$DESTDIR}${pyver}'"
-				done
-			fi
+		if [ -d ${DESTDIR}/usr/bin ]; then
+			find ${DESTDIR}/usr/bin -type f ! -name "*[[:digit:]]" | while IFS= read -r f _; do
+				mv "${f}" "${f}${pyver%.*}"
+				echo "[python-module] Unversioned script renamed to '${f#$DESTDIR}${pyver%.*}'"
+			done
 		fi
 	done
 }
--- a/common/build-style/python2-module.sh
+++ b/common/build-style/python2-module.sh
@@ -0,0 +1,37 @@
+#
+# This helper is for templates installing python2-only modules.
+#
+
+do_build() {
+	if [ -n "$CROSS_BUILD" ]; then
+		PYPREFIX="$XBPS_CROSS_BASE"
+		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
+		LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
+		CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
+		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}
+	else
+		python2 setup.py build --build-base=build-${py2_ver} ${make_build_args}
+	fi
+}
+
+do_install() {
+	if [ -n "$CROSS_BUILD" ]; then
+		PYPREFIX="$XBPS_CROSS_BASE"
+		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
+		LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
+		CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
+		LDSHARED="${CC} -shared $LDFLAGS"
+		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}
+	fi
+}
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -0,0 +1,37 @@
+#
+# This helper is for templates installing python3-only modules.
+#
+
+do_build() {
+	if [ -n "$CROSS_BUILD" ]; then
+		PYPREFIX="$XBPS_CROSS_BASE"
+		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
+		LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib"
+		CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
+		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}
+	else
+		python3 setup.py build --build-base=build-${py3_ver} ${make_build_args}
+	fi
+}
+
+do_install() {
+	if [ -n "$CROSS_BUILD" ]; then
+		PYPREFIX="$XBPS_CROSS_BASE"
+		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
+		LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib"
+		CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
+		LDSHARED="${CC} -shared $LDFLAGS"
+		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}
+	fi
+}
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -0,0 +1,18 @@
+#
+# Useful variables for determining Python version and paths.
+#
+__python2="/usr/bin/python2"
+__python3="/usr/bin/python3"
+
+if [ -x ${__python2} ]; then
+  py2_ver="$(${__python2} -c 'import sys; print(sys.version[:3])')"
+  py2_lib="$(${__python2} -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(0, 1))')"
+  py2_sitelib="$(${__python2} -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')"
+  py2_inc="$(${__python2} -c 'from distutils.sysconfig import get_python_inc; print(get_python_inc())')"
+fi
+if [ -x ${__python3} ]; then
+  py3_ver="$(${__python3} -c 'import sys; print(sys.version[:3])')"
+  py3_lib="$(${__python3} -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(0, 1))')"
+  py3_sitelib="$(${__python3} -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')"
+  py3_inc="$(${__python3} -c 'from distutils.sysconfig import get_python_inc; print(get_python_inc())')"
+fi
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -5,7 +5,7 @@
 unset -v pkgname version revision short_desc homepage license maintainer
 unset -v only_for_archs distfiles checksum build_style nocross broken
 unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
-unset -v make_cmd make_build_args make_install_args make_build_target make_install_target python_versions stackage
+unset -v make_cmd make_build_args make_install_args make_build_target make_install_target stackage
 unset -v patch_args disable_parallel_build keep_libtool_archives
 unset -v reverts subpackages makedepends hostmakedepends depends restricted
 unset -v nopie build_options build_options_default bootstrap repository reverts
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -231,6 +231,10 @@ _EOF
 	#
 	# Handle python bytecode archives with pycompile trigger.
 	#
+	if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
+		pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+	fi
+
 	if [ -n "${pycompile_dirs}" -o -n "${pycompile_module}" ]; then
 		echo "export pycompile_version=\"${pycompile_version:=2.7}\"" >>$tmpf
 		if [ -n "${pycompile_dirs}" ]; then
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -2,36 +2,23 @@
 #	- rewrites python shebangs with the corresponding python version

 hook() {
-	local pyver= shebang= warn= off=
+	local pyver= shebang= off=

-	case $pkgname in
-	python-*)
-		pyver=2.7;;
-	python3.4-*)
-		pyver=3.4;;
-	python3.5-*)
-		pyver=3.5;;
-	*)
-		for i in $pycompile_version $python_versions; do
-			if [ "$pyver" ]; then
-				warn=1
-				break;
-			fi
-			pyver=$i
-		done
-		: ${pyver:=2.7}
-		;;
-	esac
+	: ${pyver:=2}

-	shebang="#!/usr/bin/python$pyver"
+	if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
+		pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+	fi
+
+	if [ -n "$pycompile_version" ]; then
+		pyver="$pycompile_version"
+	fi
+
+	shebang="#!/usr/bin/python${pyver%.*}"
 	find ${PKGDESTDIR} -type f -print0 | \
-		xargs -0 grep -H -b -m 1 "^#!.*\([[:space:]]\|/\)python\([[:space:]]\|$\)" -- | while IFS=: read -r f off _; do
+		xargs -0 grep -H -b -m 1 "^#!.*\([[:space:]]\|/\)python\([[:space:]]*\|$\)" -- | while IFS=: read -r f off _; do
 		[ -z "$off" ] &&  continue
-		if [ "$warn" ]; then
-			msg_warn "$pkgver: multiple python versions defined! (using $pyver for shebangs)\n"
-			unset warn
-		fi
-		echo "   Unversioned shebang replaced by '$shebang': ${f#$PKGDESTDIR}"
-		sed -i "1s@.*python@${shebang}@" -- "$f"
+		echo "   Shebang converted to '$shebang': ${f#$PKGDESTDIR}"
+		sed -i "1s@.*python.*@${shebang}@" -- "$f"
 	done
 }