commit: 2a52d587ee6b149e97f67decb9cd64bec7598870 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Tue Apr 25 19:27:34 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 25 21:26:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a52d587
dev-libs/keystone: remove unnecessary dependency to sys-devel/llvm LLVM is bundled to the keystone. Closes: https://bugs.gentoo.org/905008 Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/30755 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{keystone-9999.ebuild => keystone-0.9.2-r2.ebuild} | 15 +++++---------- dev-libs/keystone/keystone-9999.ebuild | 13 ++++--------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-0.9.2-r2.ebuild similarity index 76% copy from dev-libs/keystone/keystone-9999.ebuild copy to dev-libs/keystone/keystone-0.9.2-r2.ebuild index 0187a48fc4cd..7298fa032259 100644 --- a/dev-libs/keystone/keystone-9999.ebuild +++ b/dev-libs/keystone/keystone-0.9.2-r2.ebuild @@ -3,7 +3,6 @@ EAPI=8 -LLVM_MAX_SLOT=14 DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools @@ -19,22 +18,19 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" fi S="${WORKDIR}"/${P/_rc/-rc} LICENSE="GPL-2" SLOT="0" -# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} +# Keep in sync with llvm/CMakeLists.txt +KEYSTONE_TARGETS="AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86" -IUSE="debug python ${ALL_LLVM_TARGETS[*]}" +IUSE="debug python" RDEPEND=" - <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[${LLVM_TARGET_USEDEPS// /,}] python? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND}" @@ -49,7 +45,6 @@ BDEPEND=" RESTRICT=test # only regression tests REQUIRED_USE=" - || ( ${ALL_LLVM_TARGETS[*]} ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -83,7 +78,7 @@ src_configure() { -DCMAKE_CONFIGURATION_TYPES="Gentoo" -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DBUILD_SHARED_LIBS=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_TARGETS_TO_BUILD="${KEYSTONE_TARGETS// /;}" -DLLVM_HOST_TRIPLE="${CHOST}" -DPYTHON_EXECUTABLE="${PYTHON}" ) diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild index 0187a48fc4cd..aec73814fd16 100644 --- a/dev-libs/keystone/keystone-9999.ebuild +++ b/dev-libs/keystone/keystone-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -LLVM_MAX_SLOT=14 DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools @@ -26,15 +25,12 @@ S="${WORKDIR}"/${P/_rc/-rc} LICENSE="GPL-2" SLOT="0" -# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} +# Keep in sync with llvm/CMakeLists.txt +KEYSTONE_TARGETS="AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86" -IUSE="debug python ${ALL_LLVM_TARGETS[*]}" +IUSE="debug python" RDEPEND=" - <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[${LLVM_TARGET_USEDEPS// /,}] python? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND}" @@ -49,7 +45,6 @@ BDEPEND=" RESTRICT=test # only regression tests REQUIRED_USE=" - || ( ${ALL_LLVM_TARGETS[*]} ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -83,7 +78,7 @@ src_configure() { -DCMAKE_CONFIGURATION_TYPES="Gentoo" -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DBUILD_SHARED_LIBS=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_TARGETS_TO_BUILD="${KEYSTONE_TARGETS// /;}" -DLLVM_HOST_TRIPLE="${CHOST}" -DPYTHON_EXECUTABLE="${PYTHON}" )
