| 1 |
commit: 0c39a7c5da116a8063e47ab99fb9702b472d7d74 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 15 06:53:00 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 15 06:53:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c39a7c5 |
| 7 |
|
| 8 |
dev-ada/libgpr: No need to select gcc compiler now |
| 9 |
|
| 10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-ada/libgpr/files/libgpr-2018-gentoo.patch | 55 +++++++++++++++++++++++++++ |
| 14 |
dev-ada/libgpr/libgpr-2018.ebuild | 14 ++----- |
| 15 |
2 files changed, 58 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch b/dev-ada/libgpr/files/libgpr-2018-gentoo.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..013a56b92e7 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ada/libgpr/files/libgpr-2018-gentoo.patch |
| 22 |
@@ -0,0 +1,55 @@ |
| 23 |
+--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 |
| 24 |
++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 |
| 25 |
+@@ -1948,6 +1948,8 @@ |
| 26 |
+ |
| 27 |
+ end if; |
| 28 |
+ |
| 29 |
++ Add_Directories (Self, "/usr/share/gpr"); |
| 30 |
++ |
| 31 |
+ if Gpr_Prj_Path.all /= "" then |
| 32 |
+ Add_Directories (Self, Gpr_Prj_Path.all); |
| 33 |
+ end if; |
| 34 |
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 |
| 35 |
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 |
| 36 |
+@@ -27,6 +27,8 @@ |
| 37 |
+ Name_Buffer : String (1 .. 1_000_000); |
| 38 |
+ Name_Len : Natural := 0; |
| 39 |
+ |
| 40 |
++ Last_Id : Name_Id := Name_Id'First; |
| 41 |
++ |
| 42 |
+ procedure Get_Name_String (Id : Name_Id); |
| 43 |
+ procedure Get_Name_String (Id : Unit_Name_Type); |
| 44 |
+ procedure Get_Name_String (Id : File_Name_Type); |
| 45 |
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 |
| 46 |
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 |
| 47 |
+@@ -354,6 +354,8 @@ |
| 48 |
+ |
| 49 |
+ Name_Chars.Append (ASCII.NUL); |
| 50 |
+ |
| 51 |
++ Last_Id := Name_Entries.Last; |
| 52 |
++ |
| 53 |
+ return Name_Entries.Last; |
| 54 |
+ end Name_Enter; |
| 55 |
+ |
| 56 |
+@@ -427,6 +429,8 @@ |
| 57 |
+ |
| 58 |
+ Name_Chars.Append (ASCII.NUL); |
| 59 |
+ |
| 60 |
++ Last_Id := Name_Entries.Last; |
| 61 |
++ |
| 62 |
+ return Name_Entries.Last; |
| 63 |
+ end Name_Find; |
| 64 |
+ |
| 65 |
+--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 |
| 66 |
++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 |
| 67 |
+@@ -53,6 +53,10 @@ |
| 68 |
+ return; |
| 69 |
+ end if; |
| 70 |
+ |
| 71 |
++ if Last_Id = Name_Id'First then |
| 72 |
++ Add_Name (""); |
| 73 |
++ end if; |
| 74 |
++ |
| 75 |
+ Add_Name ("a"); |
| 76 |
+ Add_Name ("b"); |
| 77 |
+ Add_Name ("c"); |
| 78 |
|
| 79 |
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild |
| 80 |
index c16efb2bfd5..10776c86ccd 100644 |
| 81 |
--- a/dev-ada/libgpr/libgpr-2018.ebuild |
| 82 |
+++ b/dev-ada/libgpr/libgpr-2018.ebuild |
| 83 |
@@ -1,4 +1,4 @@ |
| 84 |
-# Copyright 1999-2018 Gentoo Foundation |
| 85 |
+# Copyright 1999-2018 Gentoo Authors |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
|
| 88 |
EAPI=6 |
| 89 |
@@ -20,11 +20,11 @@ RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?] |
| 90 |
dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] |
| 91 |
!net-libs/grpc" |
| 92 |
DEPEND="${RDEPEND} |
| 93 |
- dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" |
| 94 |
+ >=dev-ada/gprbuild-2018[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" |
| 95 |
|
| 96 |
S="${WORKDIR}"/${MYP}-src |
| 97 |
|
| 98 |
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch ) |
| 99 |
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 100 |
|
| 101 |
src_configure() { |
| 102 |
emake prefix="${D}"usr setup |
| 103 |
@@ -36,14 +36,6 @@ src_compile() { |
| 104 |
-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \ |
| 105 |
gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die |
| 106 |
} |
| 107 |
- if use gnat_2016; then |
| 108 |
- GCC_PV=4.9.4 |
| 109 |
- elif use gnat_2017; then |
| 110 |
- GCC_PV=6.3.0 |
| 111 |
- else |
| 112 |
- GCC_PV=7.3.1 |
| 113 |
- fi |
| 114 |
- GCC=${CHOST}-gcc-${GCC_PV} |
| 115 |
if use shared; then |
| 116 |
build relocatable |
| 117 |
fi |
Archives