commit: 580a47c96931573117f7b9b1563c382815e6a142
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 9 19:20:31 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Nov 9 19:20:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580a47c9
dev-ada/libgpr: Stabilize 2018 version
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/libgpr/files/libgpr-2016-gentoo.patch | 6 +--
dev-ada/libgpr/files/libgpr-2017-gentoo.patch | 65 ---------------------------
dev-ada/libgpr/libgpr-2016.ebuild | 8 +---
dev-ada/libgpr/libgpr-2017.ebuild | 10 +----
dev-ada/libgpr/libgpr-2018.ebuild | 2 +-
5 files changed, 7 insertions(+), 84 deletions(-)
diff --git a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch
b/dev-ada/libgpr/files/libgpr-2016-gentoo.patch
index 2ddbab095d7..0282e60892b 100644
--- a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch
+++ b/dev-ada/libgpr/files/libgpr-2016-gentoo.patch
@@ -20,15 +20,15 @@
libgpr.build.shared:
- ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr
-+ ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr
-cargs:Ada $(ADAFLAGS)
++ ${BUILDER} -v -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr
-cargs:Ada $(ADAFLAGS)
libgpr.build.static:
- ${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr
-+ ${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada
$(ADAFLAGS)
++ ${BUILDER} -v -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada
$(ADAFLAGS)
libgpr.build.static-pic:
- ${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr
-+ ${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -cargs:Ada
$(ADAFLAGS)
++ ${BUILDER} -v -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr
-cargs:Ada $(ADAFLAGS)
libgpr.install: $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t))
diff --git a/dev-ada/libgpr/files/libgpr-2017-gentoo.patch
b/dev-ada/libgpr/files/libgpr-2017-gentoo.patch
deleted file mode 100644
index 656240e6258..00000000000
--- a/dev-ada/libgpr/files/libgpr-2017-gentoo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- gprbuild-2017/gpr/gpr.gpr.old 2017-05-27 20:59:07.061135892 +0200
-+++ gprbuild-2017/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200
-@@ -67,6 +67,7 @@
- for Switches ("gpr*.ad?") use
- Compiler'Default_Switches ("Ada") & ("-g1");
- end case;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- end GPR;
---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13
22:16:53.349083426 +0100
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351
+0100
-@@ -1948,6 +1948,8 @@
-
- end if;
-
-+ Add_Directories (Self, "/usr/share/gpr");
-+
- if Gpr_Prj_Path.all /= "" then
- Add_Directories (Self, Gpr_Prj_Path.all);
- end if;
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19
13:09:18.947527738 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19
13:10:08.125654595 +0100
-@@ -27,6 +27,8 @@
- Name_Buffer : String (1 .. 1_000_000);
- Name_Len : Natural := 0;
-
-+ Last_Id : Name_Id := Name_Id'First;
-+
- procedure Get_Name_String (Id : Name_Id);
- procedure Get_Name_String (Id : Unit_Name_Type);
- procedure Get_Name_String (Id : File_Name_Type);
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19
13:10:27.674316703 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19
13:14:38.360963627 +0100
-@@ -354,6 +354,8 @@
-
- Name_Chars.Append (ASCII.NUL);
-
-+ Last_Id := Name_Entries.Last;
-+
- return Name_Entries.Last;
- end Name_Enter;
-
-@@ -427,6 +429,8 @@
-
- Name_Chars.Append (ASCII.NUL);
-
-+ Last_Id := Name_Entries.Last;
-+
- return Name_Entries.Last;
- end Name_Find;
-
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19
13:12:41.592995718 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19
13:16:31.980979696 +0100
-@@ -53,6 +53,10 @@
- return;
- end if;
-
-+ if Last_Id = Name_Id'First then
-+ Add_Name ("");
-+ end if;
-+
- Add_Name ("a");
- Add_Name ("b");
- Add_Name ("c");
diff --git a/dev-ada/libgpr/libgpr-2016.ebuild
b/dev-ada/libgpr/libgpr-2016.ebuild
index 39fb18af689..da4fca933e6 100644
--- a/dev-ada/libgpr/libgpr-2016.ebuild
+++ b/dev-ada/libgpr/libgpr-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,12 +26,6 @@ REQUIRED_USE="|| ( shared static-libs static-pic )"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
- if use gnat_2016; then
- GCC_PV=4.9.4
- else
- GCC_PV=6.3.0
- fi
- GCC=${CHOST}-gcc-${GCC_PV}
if use static-libs; then
emake PROCESSORS=$(makeopts_jobs) libgpr.build.static
fi
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild
b/dev-ada/libgpr/libgpr-2017.ebuild
index f2ca1d51073..f143af3dc4f 100644
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${MYP}-src
REQUIRED_USE="|| ( shared static-libs static-pic )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
src_configure() {
emake prefix="${D}"usr setup
@@ -35,12 +35,6 @@ src_compile() {
-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
- GCC_PV=6.3.0
- fi
- GCC=${CHOST}-gcc-${GCC_PV}
if use shared; then
build relocatable
fi
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild
b/dev-ada/libgpr/libgpr-2018.ebuild
index 10776c86ccd..ae6c33a82bb 100644
--- a/dev-ada/libgpr/libgpr-2018.ebuild
+++ b/dev-ada/libgpr/libgpr-2018.ebuild
@@ -13,7 +13,7 @@
SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
-> ${MYP}-src.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
