From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C404158086 for ; Fri, 24 Dec 2021 21:46:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22FB92BC01A; Fri, 24 Dec 2021 21:46:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F8CB2BC01A for ; Fri, 24 Dec 2021 21:46:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F1FD3431FC for ; Fri, 24 Dec 2021 21:46:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FA64239 for ; Fri, 24 Dec 2021 21:46:20 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1640382361.85ec0821667f4c9b44fab0b3b60dd8c481f3a159.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/libadalang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/libadalang/libadalang-22.0.0.ebuild dev-ada/libadalang/metadata.xml X-VCS-Directories: dev-ada/libadalang/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 85ec0821667f4c9b44fab0b3b60dd8c481f3a159 X-VCS-Branch: master Date: Fri, 24 Dec 2021 21:46:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ec405e92-420e-41c8-a4c2-c2bd27c3e22d X-Archives-Hash: d5a5d6562e5c0b0ff7e26af85f8c2e51 commit: 85ec0821667f4c9b44fab0b3b60dd8c481f3a159 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Dec 24 21:46:01 2021 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Fri Dec 24 21:46:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ec0821 dev-ada/libadalang: build examples Closes: https://bugs.gentoo.org/829871 Closes: https://bugs.gentoo.org/829870 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/libadalang/libadalang-22.0.0.ebuild | 32 ++++++++++++++++++++--------- dev-ada/libadalang/metadata.xml | 1 - 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild index 9e708b92291c..5cdedddef0be 100644 --- a/dev-ada/libadalang/libadalang-22.0.0.ebuild +++ b/dev-ada/libadalang/libadalang-22.0.0.ebuild @@ -16,17 +16,16 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="GPL-3 gcc-runtime-library-exception-3.1" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="test shared +static-libs static-pic" -REQUIRED_USE="|| ( shared static-libs static-pic ) - ${PYTHON_REQUIRED_USE} +IUSE="test +static-libs static-pic" +REQUIRED_USE="${PYTHON_REQUIRED_USE} ${ADA_REQUIRED_USE}" RESTRICT="!test? ( test )" RDEPEND="dev-python/pyyaml - dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?] + dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared,static-libs?,static-pic?] ${ADA_DEPS} ${PYTHON_DEPS} - dev-ada/langkit[${ADA_USEDEP},shared?,static-libs?,static-pic?] + dev-ada/langkit[${ADA_USEDEP},shared,static-libs?,static-pic?] $(python_gen_cond_dep ' dev-ada/langkit[${PYTHON_USEDEP}] ')" @@ -51,12 +50,15 @@ pkg_setup() { if use static-pic; then libType+=',static-pic' fi - if use shared; then - libType+=',relocatable' - fi + libType+=',relocatable' libType=${libType:1} } +src_prepare() { + default + rm -r testsuite/tests/misc/copyright || die +} + src_configure() { ${EPYTHON} manage.py generate -v debug || die } @@ -67,11 +69,21 @@ src_compile() { -j$(makeopts_jobs) \ --gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}" \ --library-types=${libType} || die + GPR_PROJECT_PATH="${S}"/build \ + gprbuild -P contrib/highlight/highlight.gpr \ + -j$(makeopts_jobs) -v \ + -XBUILD_MODE=prod \ + -XLIBRARY_TYPE=relocatable \ + -XXMLADA_BUILD=relocatable \ + -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \ + || die } src_test() { - ${EPYTHON} manage.py test --restricted-env -j 1 - ${EPYTHON} manage.py test --restricted-env -j 1 |& tee libadalang.testOut + ${EPYTHON} manage.py test \ + --build-mode "prod" \ + --restricted-env -j 1 \ + |& tee libadalang.testOut grep -qw FAIL libadalang.testOut && die } diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml index 217288dff7b1..7752dcfa6bda 100644 --- a/dev-ada/libadalang/metadata.xml +++ b/dev-ada/libadalang/metadata.xml @@ -5,7 +5,6 @@ ada@gentoo.org - Build shared library Build static library with pic code