commit: 1a46496b732ee1cf210967bccbf8aa4b776521ab Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Thu Mar 6 18:03:25 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Thu Mar 6 18:05:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a46496b
dev-ada/lal-refactor: fix test build Closes: https://bugs.gentoo.org/945089 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ada/lal-refactor/Manifest | 1 - .../lal-refactor-0_p20231027-r1.ebuild | 96 ---------------------- dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild | 36 +++++++- dev-ada/lal-refactor/metadata.xml | 1 - 4 files changed, 33 insertions(+), 101 deletions(-) diff --git a/dev-ada/lal-refactor/Manifest b/dev-ada/lal-refactor/Manifest index 39f5904995f1..4d85b80e2b67 100644 --- a/dev-ada/lal-refactor/Manifest +++ b/dev-ada/lal-refactor/Manifest @@ -1,2 +1 @@ -DIST lal-refactor-0_p20231027.tar.gz 211389 BLAKE2B 3963a99b785f3559ef176cfda8c289ce9ea2ee79da913392bc4f33f9e5821f3fba28cf1410b299ba717f3433eca101e3574fac18d1f3ad2dd0308153332dd200 SHA512 28388fbecab471a8d5dda1890dbe00f90e1c8dba96f253e97772f699d4953ca46c56db93d69b781b8642562b0c5376e28cbff51f8dd62d90dfafc1d65567d1bd DIST lal-refactor-25.0.0.tar.gz 223818 BLAKE2B 6f53a278880b9d65ecd90c779323421e3cd3067ff920fc5fd851c1ded22a9819f50efa3eb6030ceb5f60d74070433d1953fbd0b194cd552733461aca6fbe3008 SHA512 c93136c3c05410bcb72bf9fbde409b371851c5f0e394670d8dd43d09219d756e10fef126911bbf6656a640c31b467fa49f826316e55a71f4f61a50952bb6980c diff --git a/dev-ada/lal-refactor/lal-refactor-0_p20231027-r1.ebuild b/dev-ada/lal-refactor/lal-refactor-0_p20231027-r1.ebuild deleted file mode 100644 index bd24629f477a..000000000000 --- a/dev-ada/lal-refactor/lal-refactor-0_p20231027-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ADA_COMPAT=( gcc_12 gcc_13 ) -inherit ada multiprocessing - -commitId=a5997083efc0ae97ec089b18931c765d43301072 - -DESCRIPTION="Refactoring tools for the Ada programming language" -HOMEPAGE="https://github.com/AdaCore/lal-refactor"; -SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz - -> ${P}.tar.gz" - -S="${WORKDIR}"/${PN}-${commitId} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+shared static-libs static-pic" -REQUIRED_USE="|| ( shared static-libs static-pic ) - ${ADA_REQUIRED_USE}" - -RDEPEND="${ADADEPS} - dev-ada/libadalang-tools[${ADA_USEDEP},shared?,static-libs?,static-pic?]" -BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]" - -src_compile() { - build () { - gprbuild -v -k -XLIBRARY_TYPE=$1 -j$(makeopts_jobs) -p \ - -XLAL_REFACTOR_LIBRARY_TYPE=$1 \ - -XLAL_REFACTOR_BUILD_MODE=prod \ - -P gnat/lal_refactor.gpr \ - -largs ${LDFLAGS} \ - -cargs ${ADAFLAGS} || die - - } - if use shared; then - build relocatable - fi - if use static-libs; then - build static - fi - if use static-pic; then - build static-pic - fi - - if use static-libs; then - libtype='static' - elif use static-pic; then - libtype='static-pic' - elif use shared; then - libtype='relocatable' - fi - gprbuild -v -k -XLIBRARY_TYPE=${libtype} -j$(makeopts_jobs) -p \ - -XLAL_REFACTOR_LIBRARY_TYPE=${libtype} \ - -XLAL_REFACTOR_BUILD_MODE=prod \ - -Pgnat/lal_refactor_driver.gpr \ - -largs ${LDFLAGS} \ - -cargs ${ADAFLAGS} || die -} - -src_install() { - build () { - gprinstall \ - -XLAL_REFACTOR_LIBRARY_TYPE=$1 \ - -XLIBRARY_TYPE=$1 \ - -XLAL_REFACTOR_BUILD_MODE=prod \ - --prefix="${D}"/usr \ - --sources-subdir=include/lal-refactor \ - --build-name=$1 \ - --build-var=LIBRARY_TYPE \ - -P gnat/lal_refactor.gpr -p -f || die - } - if use shared; then - build relocatable - fi - if use static-libs; then - build static - fi - if use static-pic; then - build static-pic - fi - gprinstall \ - -XLAL_REFACTOR_LIBRARY_TYPE=${libtype} \ - -XLIBRARY_TYPE=${libtype} \ - -XBUILD_MODE=prod \ - --prefix="${D}"/usr \ - -P gnat/lal_refactor_driver.gpr \ - -p \ - -f || die - - einstalldocs - rm -rf "${D}"/usr/share/gpr/manifests -} diff --git a/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild b/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild index cb59900d58e1..ac6e4831f56a 100644 --- a/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild +++ b/dev-ada/lal-refactor/lal-refactor-25.0.0-r1.ebuild @@ -4,7 +4,8 @@ EAPI=8 ADA_COMPAT=( gcc_14 ) -inherit ada multiprocessing +PYTHON_COMPAT=( python3_{10..13} pypy3 ) +inherit ada python-any-r1 multiprocessing commitId=a5997083efc0ae97ec089b18931c765d43301072 @@ -16,13 +17,30 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" -IUSE="static-libs static-pic" +IUSE="static-libs static-pic test" REQUIRED_USE="${ADA_REQUIRED_USE}" +RESTRICT="!test? ( test )" RDEPEND="${ADADEPS} dev-ada/libadalang:${SLOT}[${ADA_USEDEP},static-libs?,static-pic?] dev-ada/libadalang-tools:${SLOT}[${ADA_USEDEP},shared,static-libs?,static-pic?]" -BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]" +BDEPEND=" + dev-ada/gprbuild[${ADA_USEDEP}] + test? ( + $(python_gen_any_dep ' + dev-ada/e3-testsuite[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup + ada_pkg_setup +} src_compile() { build () { @@ -37,6 +55,18 @@ src_compile() { gprbuild -v -k -XLAL_REFACTOR_LIBRARY_TYPE=relocatable \ -XLIBRARY_TYPE=relocatable -Pgnat/lal_refactor_driver.gpr -p \ -j$(makeopts_jobs) -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die + + if use test; then + GPR_PROJECT_PATH=gnat \ + gprbuild -v -k -XLAL_REFACTOR_LIBRARY_TYPE=relocatable \ + -XLIBRARY_TYPE=relocatable \ + -P testsuite/ada_drivers/gnat/lal_refactor_test_drivers.gpr \ + -p -j$(makeopts_jobs) || die + fi +} + +src_test() { + ${PYTHON} testsuite/testsuite.py || die } src_install() { diff --git a/dev-ada/lal-refactor/metadata.xml b/dev-ada/lal-refactor/metadata.xml index 026707ed72f0..d21c0ffa78cf 100644 --- a/dev-ada/lal-refactor/metadata.xml +++ b/dev-ada/lal-refactor/metadata.xml @@ -5,7 +5,6 @@ <email>[email protected]</email> </maintainer> <use> - <flag name="shared">Build shared library</flag> <flag name="static-pic">Build static library with pic code</flag> </use> <upstream>
