commit: 72e21ed97ef7f7e5a9a2e71e3ea326dc7f91a406 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Mon Jan 30 23:03:56 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Feb 17 17:25:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e21ed9
dev-libs/capstone: don't install static libraries unconditionally Closes: https://bugs.gentoo.org/890941 Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/29350 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> .../{capstone-9999.ebuild => capstone-5.0_rc2-r3.ebuild} | 16 +++++++++++++--- dev-libs/capstone/capstone-9999.ebuild | 11 ++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild similarity index 81% copy from dev-libs/capstone/capstone-9999.ebuild copy to dev-libs/capstone/capstone-5.0_rc2-r3.ebuild index 259fa40dbb50..52e6eaa6617a 100644 --- a/dev-libs/capstone/capstone-9999.ebuild +++ b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild @@ -5,6 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools inherit cmake distutils-r1 toolchain-funcs @@ -17,22 +18,27 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_BRANCH="next" else SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" + S=${WORKDIR}/${P/_rc/-rc} + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="BSD" SLOT="0/5" # libcapstone.so.5 -IUSE="python test" +IUSE="python static-libs test" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) " +BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" distutils_enable_tests setup.py -S=${WORKDIR}/${P/_rc/-rc} +PATCHES=( + "${FILESDIR}"/${P}-pkgconfig.patch + "${FILESDIR}"/${P}-oob-mem-access.patch +) if [[ ${PV} == *_rc* ]]; then # Upstream doesn't flag release candidates (bug 858350) @@ -82,4 +88,8 @@ src_install() { cmake_src_install wrap_python ${FUNCNAME} + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi } diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild index 259fa40dbb50..ef624cde1cad 100644 --- a/dev-libs/capstone/capstone-9999.ebuild +++ b/dev-libs/capstone/capstone-9999.ebuild @@ -5,6 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools inherit cmake distutils-r1 toolchain-funcs @@ -17,23 +18,23 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_BRANCH="next" else SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P/_rc/-rc} KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" fi LICENSE="BSD" SLOT="0/5" # libcapstone.so.5 -IUSE="python test" +IUSE="python static-libs test" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) " +BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" distutils_enable_tests setup.py -S=${WORKDIR}/${P/_rc/-rc} - if [[ ${PV} == *_rc* ]]; then # Upstream doesn't flag release candidates (bug 858350) QA_PKGCONFIG_VERSION="" @@ -82,4 +83,8 @@ src_install() { cmake_src_install wrap_python ${FUNCNAME} + + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi }
