dev-libs/boost: Drop unneeded and broken cross-compile Python hack

It was broken under Python 3 (python3.6 vs python3.6m) and the new Python eclass fixes mean it's not needed any more. 1.63 and 1.65 now cross-compile successfully. 1.66 and 1.67 fail early but for a seemingly different reason. They are unkeyworded anyway. Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
gentoo · Jan 2, 2019 · 3d32c32 · 3d32c32
1 parent 0d0f59f
commit 3d32c32
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 36 deletions.
diff --git a/dev-libs/boost/boost-1.63.0.ebuild b/dev-libs/boost/boost-1.63.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,14 +81,10 @@ create_user-config.jam() {
 		# TODO: replace it with proper override one day
 		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
 
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
+		# note: we need to provide version explicitly because of a bug
+		# in the build system:
+		# https://github.com/boostorg/build/pull/104
+		python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 	fi
 
 	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die

diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,14 +81,10 @@ create_user-config.jam() {
 		# TODO: replace it with proper override one day
 		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
 
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
+		# note: we need to provide version explicitly because of a bug
+		# in the build system:
+		# https://github.com/boostorg/build/pull/104
+		python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 	fi
 
 	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die

diff --git a/dev-libs/boost/boost-1.66.0.ebuild b/dev-libs/boost/boost-1.66.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,14 +81,10 @@ create_user-config.jam() {
 		# TODO: replace it with proper override one day
 		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
 
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
+		# note: we need to provide version explicitly because of a bug
+		# in the build system:
+		# https://github.com/boostorg/build/pull/104
+		python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 	fi
 
 	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die

diff --git a/dev-libs/boost/boost-1.67.0-r1.ebuild b/dev-libs/boost/boost-1.67.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -85,14 +85,10 @@ create_user-config.jam() {
 		# TODO: replace it with proper override one day
 		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
 
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
+		# note: we need to provide version explicitly because of a bug
+		# in the build system:
+		# https://github.com/boostorg/build/pull/104
+		python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 	fi
 
 	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die