summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTupone Alfredo <tupone@gentoo.org>2018-02-12 20:09:24 +0100
committerTupone Alfredo <tupone@gentoo.org>2018-02-12 20:09:24 +0100
commit802c50cbcdd29d5c192c9a7b3c46f8effec84449 (patch)
tree052cc3f2348c3922d159619393ae172c13eed4f4 /dev-ada/gnat_util
parentmedia-libs/fontconfig-infinality: QA fix for DESCRIPTION (diff)
downloadgentoo-802c50cbcdd29d5c192c9a7b3c46f8effec84449.tar.gz
gentoo-802c50cbcdd29d5c192c9a7b3c46f8effec84449.tar.bz2
gentoo-802c50cbcdd29d5c192c9a7b3c46f8effec84449.zip
dev-ada/gnat_util: use static -> static-libs
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-ada/gnat_util')
-rw-r--r--dev-ada/gnat_util/gnat_util-2016.ebuild14
-rw-r--r--dev-ada/gnat_util/gnat_util-2017.ebuild14
-rw-r--r--dev-ada/gnat_util/metadata.xml1
3 files changed, 20 insertions, 9 deletions
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index 2fc260b394a..4cc279585ec 100644
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-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
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
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="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
@@ -37,7 +37,10 @@ src_compile() {
GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
- for kind in shared static static-pic; do
+ if use ${kind}; then
+ emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+ fi
+ for kind in shared static-pic; do
if use ${kind}; then
emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
build-${kind}
@@ -46,7 +49,10 @@ src_compile() {
}
src_install() {
- for kind in shared static static-pic; do
+ if use static-libs; then
+ emake prefix="${D}"/usr install-static
+ fi
+ for kind in shared static-pic; do
if use ${kind}; then
emake prefix="${D}"/usr install-${kind}
fi
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index 6116171b45c..88db63ccf09 100644
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017.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
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
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-lang/gnat-gpl:6.3.0"
DEPEND="${RDEPEND}
@@ -36,7 +36,10 @@ src_compile() {
GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
- for kind in shared static static-pic; do
+ if use static-libs; then
+ emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+ fi
+ for kind in shared static-pic; do
if use ${kind}; then
emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
build-${kind}
@@ -45,7 +48,10 @@ src_compile() {
}
src_install() {
- for kind in shared static static-pic; do
+ if use static-libs; then
+ emake prefix="${D}"/usr install-static
+ fi
+ for kind in shared static-pic; do
if use ${kind}; then
emake prefix="${D}"/usr install-${kind}
fi
diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
index 22a3c1f31fe..031651ccbbd 100644
--- a/dev-ada/gnat_util/metadata.xml
+++ b/dev-ada/gnat_util/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 gnat_util shared library</flag>
- <flag name="static">Build gnat_util static library</flag>
<flag name="static-pic">Build gnat_util static library with pic code</flag>
</use>
<longdescription lang="en">