gentoo resync : 16.09.2020

1 files changed, 22 insertions, 3 deletions

diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index c8398b962c6a..07b62cdb24d2 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake toolchain-funcs python-any-r1
 
@@ -16,7 +16,6 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD BSD-2 UoI-NCSA"
@@ -30,19 +29,34 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	${PYTHON_DEPS}
+	"
+BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
 	"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch"
-	"${FILESDIR}/${PN}-1.13.0-llvm-10.patch"
+	"${FILESDIR}/${PN}-1.14.0-llvm-10.patch"
 	"${FILESDIR}/${PN}-1.13.0-werror.patch"
 )
 
+src_prepare() {
+	if use amd64; then
+		# On amd64 systems, build system enables x86/i686 build too.
+		# This ebuild doesn't even have multilib support, nor need it.
+		# https://bugs.gentoo.org/730062
+		elog "Removing auto-x86 build on amd64"
+		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
+	fi
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		"-DARM_ENABLED=$(usex arm)"
+		"-DCMAKE_SKIP_RPATH=ON"
 	)
 	cmake_src_configure
 }
@@ -57,3 +71,8 @@ src_install() {
 		doins -r "${BUILD_DIR}"/examples/*
 	fi
 }
+
+src_test() {
+	# Inject path to prevent using system ispc
+	PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} run_tests.py || die "Testing failed under ${EPYTHON}"
+}