| 1 |
commit: cb73be55c4b5055df9c9233766f0f6f0a81d5f8b |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 20 17:49:12 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 20 17:49:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb73be55 |
| 7 |
|
| 8 |
dev-ada/gnatcoll-core: Stabilize |
| 9 |
|
| 10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch | 10 ---------- |
| 14 |
dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild | 12 ++++++------ |
| 15 |
2 files changed, 6 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch |
| 18 |
index cedf710c036..dcbe89df783 100644 |
| 19 |
--- a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch |
| 20 |
+++ b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch |
| 21 |
@@ -1,13 +1,3 @@ |
| 22 |
---- a/gnatcoll.gpr 2018-06-12 21:37:42.664733336 +0200 |
| 23 |
-+++ b/gnatcoll.gpr 2018-06-12 21:38:07.965360000 +0200 |
| 24 |
-@@ -115,6 +115,7 @@ |
| 25 |
- |
| 26 |
- for Switches ("gnatcoll_support.c") use |
| 27 |
- Compiler'Switches ("C") & Extra_Switches; |
| 28 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
| 29 |
- |
| 30 |
- end Compiler; |
| 31 |
- |
| 32 |
--- a/src/gnatcoll-projects.ads.old 2017-11-25 14:50:06.919939453 +0100 |
| 33 |
+++ b/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 |
| 34 |
@@ -1917,7 +1917,8 @@ |
| 35 |
|
| 36 |
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild |
| 37 |
index 88fa2a1f45a..37d1058f21c 100644 |
| 38 |
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild |
| 39 |
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-# Copyright 1999-2018 Gentoo Foundation |
| 42 |
+# Copyright 1999-2018 Gentoo Authors |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
|
| 45 |
EAPI=6 |
| 46 |
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99 |
| 47 |
|
| 48 |
LICENSE="GPL-3" |
| 49 |
SLOT="0" |
| 50 |
-KEYWORDS="~amd64 ~x86" |
| 51 |
+KEYWORDS="amd64 x86" |
| 52 |
IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic" |
| 53 |
|
| 54 |
RDEPEND=" |
| 55 |
@@ -23,14 +23,14 @@ RDEPEND=" |
| 56 |
DEPEND="${RDEPEND} |
| 57 |
dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" |
| 58 |
|
| 59 |
-REQUIRED_USE="!gnat_2016" |
| 60 |
- |
| 61 |
S="${WORKDIR}"/${MYP}-src |
| 62 |
|
| 63 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
- if use gnat_2017; then |
| 67 |
+ if use gnat_2016; then |
| 68 |
+ GCC_PV=4.9.4 |
| 69 |
+ elif use gnat_2017; then |
| 70 |
GCC_PV=6.3.0 |
| 71 |
else |
| 72 |
GCC_PV=7.3.1 |
| 73 |
@@ -48,7 +48,7 @@ src_configure() { |
| 74 |
|
| 75 |
src_compile() { |
| 76 |
build () { |
| 77 |
- GCC=${CHOST}-gcc-${GCC_PV} gprbuild -p -m -j$(makeopts_jobs) \ |
| 78 |
+ gprbuild -p -m -j$(makeopts_jobs) \ |
| 79 |
-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \ |
| 80 |
-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \ |
| 81 |
gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die |
Archives