commit: cc230d9f771bcbd4628090260a42a24529be834f
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 4 19:17:03 2020 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Apr 4 19:17:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc230d9f
dev-lang/gnat-gpl: use the toolchain eclass ada facilities
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild | 13 +------------
dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild | 15 ++-------------
dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild | 15 ++-------------
dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild | 15 ++-------------
dev-lang/gnat-gpl/metadata.xml | 1 +
5 files changed, 8 insertions(+), 51 deletions(-)
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
index 555b2df0563..b10bbb93de4 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
@@ -53,7 +53,7 @@ SRC_URI+="
LICENSE+=" GPL-2 GPL-3"
SLOT="${TOOLCHAIN_GCC_PV}"
KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
RESTRICT="!test? ( test )"
RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -145,22 +145,11 @@ src_prepare() {
src_configure() {
downgrade_arch_flags "$(gcc-version)"
toolchain_src_configure \
- --enable-languages=ada \
- --disable-libada \
CC=${GCC} \
GNATBIND=${GNATBIND} \
GNATMAKE=yes
}
-src_compile() {
- unset ADAFLAGS
- toolchain_src_compile
- gcc_do_make "-C gcc gnatlib-shared"
- ln -s gcc ../build/prev-gcc || die
- ln -s ${CHOST} ../build/prev-${CHOST} || die
- gcc_do_make "-C gcc gnattools"
-}
-
pkg_postinst() {
toolchain_pkg_postinst
einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
index 8a6cf4555b8..a0efa9b463c 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@@ -40,7 +40,7 @@ HOMEPAGE="http://libre.adacore.com/";
LICENSE+=" GPL-2 GPL-3"
SLOT="${TOOLCHAIN_GCC_PV}"
KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
RESTRICT="!test? ( test )"
RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -130,18 +130,7 @@ src_prepare() {
src_configure() {
export PATH=${PWD}/bin:${PATH}
downgrade_arch_flags "$(gcc-version)"
- toolchain_src_configure \
- --enable-languages=ada \
- --disable-libada
-}
-
-src_compile() {
- unset ADAFLAGS
- toolchain_src_compile
- gcc_do_make "-C gcc gnatlib-shared"
- ln -s gcc ../build/prev-gcc || die
- ln -s ${CHOST} ../build/prev-${CHOST} || die
- gcc_do_make "-C gcc gnattools"
+ toolchain_src_configure
}
pkg_postinst() {
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
index 6559a30cfa3..239c00d759d 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
@@ -39,7 +39,7 @@ HOMEPAGE="http://libre.adacore.com/";
LICENSE+=" GPL-2 GPL-3"
KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
RESTRICT="!test? ( test )"
RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -128,18 +128,7 @@ src_prepare() {
src_configure() {
export PATH=${PWD}/bin:${PATH}
downgrade_arch_flags "$(gcc-version)"
- toolchain_src_configure \
- --enable-languages=ada \
- --disable-libada
-}
-
-src_compile() {
- unset ADAFLAGS
- toolchain_src_compile
- gcc_do_make "-C gcc gnatlib-shared"
- ln -s gcc ../build/prev-gcc || die
- ln -s ${CHOST} ../build/prev-${CHOST} || die
- gcc_do_make "-C gcc gnattools"
+ toolchain_src_configure
}
pkg_postinst() {
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
index 2d74d35e7a0..34a131541ea 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://libre.adacore.com/";
LICENSE+=" GPL-2 GPL-3"
KEYWORDS="amd64 x86"
-IUSE="+bootstrap"
+IUSE="+ada +bootstrap"
RESTRICT="!test? ( test )"
RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -127,18 +127,7 @@ src_prepare() {
src_configure() {
export PATH=${PWD}/bin:${PATH}
downgrade_arch_flags "$(gcc-version)"
- toolchain_src_configure \
- --enable-languages=ada \
- --disable-libada
-}
-
-src_compile() {
- unset ADAFLAGS
- toolchain_src_compile
- gcc_do_make "-C gcc gnatlib-shared"
- ln -s gcc ../build/prev-gcc || die
- ln -s ${CHOST} ../build/prev-${CHOST} || die
- gcc_do_make "-C gcc gnattools"
+ toolchain_src_configure
}
pkg_postinst() {
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 923cfc961fa..d3aadec0e51 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -5,6 +5,7 @@
<email>a...@gentoo.org</email>
</maintainer>
<use>
+ <flag name="ada">Build the ADA language (GNAT) frontend</flag>
<flag name="awt">Useful only when building GCJ, this enables
Abstract
Window Toolkit (AWT) peer support on top of GTK+</flag>
<flag name="bootstrap">Used to bootstrap gnat-gpl</flag>
