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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A97A915806E for ; Mon, 22 May 2023 19:23:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC456E0ACA; Mon, 22 May 2023 19:23:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B0685E0ACA for ; Mon, 22 May 2023 19:23:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D50D43409E6 for ; Mon, 22 May 2023 19:23:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19C65A64 for ; Mon, 22 May 2023 19:23:19 +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: <1684783377.129ee4c06245a78f8a567c35658279d00fa7e136.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gpr/gpr-23.0.0-r2.ebuild dev-ada/gpr/gpr-23.0.0-r3.ebuild dev-ada/gpr/metadata.xml X-VCS-Directories: dev-ada/gpr/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 129ee4c06245a78f8a567c35658279d00fa7e136 X-VCS-Branch: master Date: Mon, 22 May 2023 19:23:19 +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: 93febc34-4662-46f7-9576-0841964ce7ee X-Archives-Hash: 583099d2e9a990f54c7fa3b0d6bee5af commit: 129ee4c06245a78f8a567c35658279d00fa7e136 Author: Alfredo Tupone gentoo org> AuthorDate: Mon May 22 19:05:02 2023 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Mon May 22 19:22:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129ee4c0 dev-ada/gpr: static-libs and static-pic control generation of .a files Closes: https://bugs.gentoo.org/902535 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gpr/gpr-23.0.0-r2.ebuild | 65 ---------------------- dev-ada/gpr/gpr-23.0.0-r3.ebuild | 113 +++++++++++++++++++++++++++++++++++++++ dev-ada/gpr/metadata.xml | 1 + 3 files changed, 114 insertions(+), 65 deletions(-) diff --git a/dev-ada/gpr/gpr-23.0.0-r2.ebuild b/dev-ada/gpr/gpr-23.0.0-r2.ebuild deleted file mode 100644 index ce0429b7f624..000000000000 --- a/dev-ada/gpr/gpr-23.0.0-r2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ADA_COMPAT=( gnat_2021 gcc_12 ) -PYTHON_COMPAT=( python3_{9,10,11} ) - -inherit python-any-r1 ada multiprocessing - -DESCRIPTION="LibGPR2 - Parser for GPR Project files" -HOMEPAGE="https://github.com/AdaCore/gpr" -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="${ADA_DEPS} - dev-ada/xmlada[${ADA_USEDEP}] - shared? ( dev-ada/xmlada[shared,static-pic] ) - dev-ada/gnatcoll-core[${ADA_USEDEP}] - shared? ( dev-ada/gnatcoll-core[shared,static-pic] ) - dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,gmp] - shared? ( dev-ada/gnatcoll-bindings[shared,static-pic] )" - -DEPEND="${RDEPEND} - dev-ada/gprconfig_kb[${ADA_USEDEP}] - dev-ada/gprbuild[${ADA_USEDEP}]" - -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-ada/langkit[${PYTHON_USEDEP}] - ')" - -IUSE="+shared" -REQUIRED_USE="${ADA_REQUIRED_USE}" - -python_check_deps() { - python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]" -} - -src_configure() { - emake PROCESSORS=$(makeopts_jobs) \ - GPR2KBDIR=/usr/share/gprconfig \ - ENABLE_SHARED=$(usex shared) \ - setup -} - -src_compile() { - emake GPRBUILD_OPTIONS=-v -} - -src_install() { - emake install \ - prefix="${D}"/usr - einstalldocs - - rm "${D}"/usr/bin/gprclean || die - rm "${D}"/usr/bin/gprconfig || die - rm "${D}"/usr/bin/gprinstall || die - rm "${D}"/usr/bin/gprls || die - rm "${D}"/usr/bin/gprname || die -} diff --git a/dev-ada/gpr/gpr-23.0.0-r3.ebuild b/dev-ada/gpr/gpr-23.0.0-r3.ebuild new file mode 100644 index 000000000000..5ac3ae0f761c --- /dev/null +++ b/dev-ada/gpr/gpr-23.0.0-r3.ebuild @@ -0,0 +1,113 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ADA_COMPAT=( gnat_2021 gcc_12 ) +PYTHON_COMPAT=( python3_{9,10,11} ) + +inherit python-any-r1 ada multiprocessing + +DESCRIPTION="LibGPR2 - Parser for GPR Project files" +HOMEPAGE="https://github.com/AdaCore/gpr" +SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +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="${ADA_DEPS} + dev-ada/xmlada[${ADA_USEDEP}] + shared? ( dev-ada/xmlada[shared,static-pic] ) + dev-ada/gnatcoll-core[${ADA_USEDEP}] + shared? ( dev-ada/gnatcoll-core[shared,static-pic] ) + dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,gmp] + shared? ( dev-ada/gnatcoll-bindings[shared,static-pic] )" + +DEPEND="${RDEPEND} + dev-ada/gprconfig_kb[${ADA_USEDEP}] + dev-ada/gprbuild[${ADA_USEDEP}]" + +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-ada/langkit[${PYTHON_USEDEP}] + ')" + +python_check_deps() { + python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]" +} + +src_configure() { + emake ENABLE_SHARED=$(usex shared) setup +} + +src_compile() { + build() { + gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \ + -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 gpr2.gpr || die + } + mkdir -p .build/kb || die + gprbuild -p -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \ + --relocate-build-tree || die + .build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die + emake -C langkit setup DEST="${S}/.build/lkparser" + 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 -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \ + -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} gpr2-tools.gpr \ + || die + gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \ + -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \ + -XLANGKIT_SUPPORT_BUILD=${libtype} gpr2-name.gpr || die +} + +src_install() { + build() { + gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \ + -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 --build-name=$1 \ + --build-var=LIBRARY_TYPE \ + --build-var=GPR2_LIBRARY_TYPE gpr2.gpr || 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 -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \ + -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \ + --build-name=${libtype} --mode=usage gpr2-tools.gpr || die + gprinstall -p -f -v -XGPR2_BUILD=release --prefix='${D}/usr' \ + -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \ + -XLANGKIT_SUPPORT_BUILD=${libtype} --build-name=${libtype} \ + --mode=usage gpr2-name.gpr || die + + einstalldocs + + rm "${D}"/usr/bin/gprclean || die + rm "${D}"/usr/bin/gprconfig || die + rm "${D}"/usr/bin/gprinstall || die + rm "${D}"/usr/bin/gprls || die +} diff --git a/dev-ada/gpr/metadata.xml b/dev-ada/gpr/metadata.xml index 51966a8cdf1e..3551228a3310 100644 --- a/dev-ada/gpr/metadata.xml +++ b/dev-ada/gpr/metadata.xml @@ -6,6 +6,7 @@ Build shared library + Build static library with pic code AdaCore/gpr