commit: 8fe4a444529636af8f98f3120796f20051637994 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> AuthorDate: Sun Feb 11 09:04:37 2018 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Feb 11 09:10:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe4a444
dev-ada/libgpr: use static -> static-libs Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-ada/libgpr/libgpr-2016.ebuild | 23 +++++++++++++---------- dev-ada/libgpr/libgpr-2017.ebuild | 39 ++++++++++++++++++++------------------- dev-ada/libgpr/metadata.xml | 1 - 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dev-ada/libgpr/libgpr-2016.ebuild b/dev-ada/libgpr/libgpr-2016.ebuild index 9747b479751..fa0836fb0b7 100644 --- a/dev-ada/libgpr/libgpr-2016.ebuild +++ b/dev-ada/libgpr/libgpr-2016.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,18 +14,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8 LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="+gnat_2016 gnat_2017 +shared static static-pic" +IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic" -RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=] - gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" +RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=]" DEPEND="${RDEPEND} - dev-ada/gprbuild" + dev-ada/gprbuild[gnat_2016=,gnat_2017=]" S="${WORKDIR}"/${MYP}-src -REQUIRED_USE="|| ( shared static static-pic ) - ^^ ( gnat_2016 gnat_2017 )" +REQUIRED_USE="|| ( shared static-libs static-pic )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_compile() { @@ -35,7 +32,10 @@ src_compile() { GCC_PV=6.3.0 fi GCC=${CHOST}-gcc-${GCC_PV} - for kind in shared static static-pic; do + if use static-libs; then + emake PROCESSORS=$(makeopts_jobs) libgpr.build.static + fi + for kind in shared static-pic; do if use ${kind}; then emake PROCESSORS=$(makeopts_jobs) libgpr.build.${kind} fi @@ -43,7 +43,10 @@ src_compile() { } src_install() { - for kind in shared static static-pic; do + if use static-libs; then + emake DESTDIR="${D}" libgpr.install.static + fi + for kind in shared static-pic; do if use ${kind}; then emake DESTDIR="${D}" libgpr.install.${kind} fi diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild index 1c5295b68c9..df6ab7a6bee 100644 --- a/dev-ada/libgpr/libgpr-2017.ebuild +++ b/dev-ada/libgpr/libgpr-2017.ebuild @@ -9,24 +9,20 @@ MYP=gprbuild-gpl-${PV} DESCRIPTION="Ada library to handle GPRbuild project files" HOMEPAGE="http://libre.adacore.com/"; -SRC_URI=" - http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 +SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 -> ${MYP}-src.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="gnat_2016 +gnat_2017 +shared static static-pic" +IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic" -RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=] - gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" +RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]" DEPEND="${RDEPEND} dev-ada/gprbuild" S="${WORKDIR}"/${MYP}-src -REQUIRED_USE="|| ( shared static static-pic ) - ^^ ( gnat_2016 gnat_2017 )" +REQUIRED_USE="|| ( shared static-libs static-pic )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_configure() { @@ -34,6 +30,11 @@ src_configure() { } src_compile() { + build () { + gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \ + -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \ + gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die + } if use gnat_2016; then GCC_PV=4.9.4 else @@ -41,21 +42,21 @@ src_compile() { fi GCC=${CHOST}-gcc-${GCC_PV} if use shared; then - gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \ - -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \ - gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die + build relocatable + fi + if use static-libs; then + build static + fi + if use static-pic; then + build static-pic fi - for kind in static static-pic; do - if use ${kind}; then - gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \ - -XLIBRARY_TYPE=${kind} -XXMLADA_BUILD=${kind} gpr/gpr.gpr \ - -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die - fi - done } src_install() { - for kind in shared static static-pic; do + if use static-libs; then + emake DESTDIR="${D}" libgpr.install.static + fi + for kind in shared static-pic; do if use ${kind}; then emake DESTDIR="${D}" libgpr.install.${kind} fi diff --git a/dev-ada/libgpr/metadata.xml b/dev-ada/libgpr/metadata.xml index 4cf88165a98..05c462d3407 100644 --- a/dev-ada/libgpr/metadata.xml +++ b/dev-ada/libgpr/metadata.xml @@ -9,7 +9,6 @@ <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> <flag name="shared">Build shared library</flag> - <flag name="static">Build static library</flag> <flag name="static-pic">Build static library with pic code</flag> </use> <longdescription lang="en">
