[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: f0ab2fe76dbbb4a425fcc6885e19e5845c940da3
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Mar 19 22:06:55 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Mar 19 22:06:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ab2fe7
dev-ada/gprbuild: fix NULL DT_RUNPATH
Closes: https://bugs.gentoo.org/834701
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/files/gprbuild-2021-runpath.patch| 11 +++
.../{gprbuild-2021-r2.ebuild => gprbuild-2021-r3.ebuild} | 3 ++-
.../{gprbuild-22.0.0-r1.ebuild => gprbuild-22.0.0-r2.ebuild} | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
new file mode 100644
index ..9224a09f9049
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
@@ -0,0 +1,11 @@
+--- a/gpr/src/gpr-util.adb 2022-03-19 22:41:32.372348082 +0100
b/gpr/src/gpr-util.adb 2022-03-19 22:41:54.325010633 +0100
+@@ -3634,7 +3634,7 @@
+ end if;
+ end loop;
+
+- return Ret;
++ return Ret(1 .. Length - Separator'Length);
+ end;
+end Concat_Paths;
+
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
similarity index 96%
rename from dev-ada/gprbuild/gprbuild-2021-r2.ebuild
rename to dev-ada/gprbuild/gprbuild-2021-r3.ebuild
index 8bfc6af4419b..3aeaaf969f80 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
"${FILESDIR}"/${PN}-22.0.0-ar.patch
+ "${FILESDIR}"/${P}-runpath.patch
)
src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
similarity index 98%
rename from dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
rename to dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
index 97506af95abf..63740fc4c7a9 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
"${FILESDIR}"/${P}-ar.patch
+ "${FILESDIR}"/${PN}-2021-runpath.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: db83afa7a333708cc8c0a5e3982ac131aa13f204
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Nov 25 07:34:38 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Nov 25 07:34:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db83afa7
dev-ada/gprbuild: unsupport gnat_2019, drop old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/Manifest | 2 -
dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch | 286 --
dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 76 --
dev-ada/gprbuild/gprbuild-2020.ebuild | 76 --
4 files changed, 440 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 7f29364e5a67..adc6ed460a2d 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,7 +1,5 @@
-DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B
3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a
SHA512
d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B
42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997
SHA512
f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B
4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d
SHA512
7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B
c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac
SHA512
69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4
-DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B
e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147
SHA512
e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B
589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35
SHA512
e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B
cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9
SHA512
7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
deleted file mode 100644
index 9e6040b8ddc9..
--- a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
+++ /dev/null
@@ -1,286 +0,0 @@
a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200
-+++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200
-@@ -266,7 +266,9 @@
-
-Driver_Name : Name_Id := No_Name;
-
-- Gnatbind_Name : String_Access := new String'("gnatbind");
-+ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
-+
-+ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
-
-Compiler_Name : String_Access := new String'("gcc");
-
-@@ -2081,7 +2083,7 @@
- and then Line (Last - 2 .. Last) = "gcc"
- then
-Gnatbind_Name :=
-- new String'(Line (1 .. Last - 3) & "gnatbind");
-+ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
-Objcopy_Name :=
- new String'(Line (1 .. Last - 3) & "objcopy");
-
-@@ -2089,7 +2091,7 @@
- and then Line (Last - 6 .. Last) = "gcc.exe"
- then
-Gnatbind_Name :=
-- new String'(Line (1 .. Last - 7) & "gnatbind");
-+ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
-Objcopy_Name :=
- new String'(Line (1 .. Last - 7) & "objcopy");
- end if;
-@@ -2241,7 +2243,13 @@
-Mapping_File_Name := new String'(Line (1 ..
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: cccdcdc5666eaacbc64bdc824be3739847f7ae8f
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Nov 13 08:35:21 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Nov 13 08:35:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cccdcdc5
dev-ada/gprbuild: 22.0.0 bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/Manifest | 3 +
.../gprbuild/files/gprbuild-22.0.0-gentoo.patch| 292 +
dev-ada/gprbuild/gprbuild-22.0.0.ebuild| 83 ++
dev-ada/gprbuild/metadata.xml | 3 +
4 files changed, 381 insertions(+)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index b5542ae5b4d..7f29364e5a6 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,7 @@
DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B
3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a
SHA512
d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B
42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997
SHA512
f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
+DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B
4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d
SHA512
7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
+DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B
c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac
SHA512
69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4
DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B
e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147
SHA512
e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B
589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35
SHA512
e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
+DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B
cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9
SHA512
7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
new file mode 100644
index 000..a974d18c414
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
@@ -0,0 +1,292 @@
+--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200
b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200
+@@ -266,7 +266,9 @@
+
+Driver_Name : Name_Id := No_Name;
+
+- Gnatbind_Name : String_Access := new String'("gnatbind");
++ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
++
++ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
+
+Compiler_Name : String_Access := new String'("gcc");
+
+@@ -2081,7 +2083,7 @@
+ and then Line (Last - 2 .. Last) = "gcc"
+ then
+Gnatbind_Name :=
+- new String'(Line (1 .. Last - 3) & "gnatbind");
++ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
+Objcopy_Name :=
+ new String'(Line (1 .. Last - 3) & "objcopy");
+
+@@ -2089,7 +2091,7 @@
+ and then Line (Last - 6 .. Last) = "gcc.exe"
+ then
+Gnatbind_Name :=
+- new String'(Line (1 .. Last - 7) & "gnatbind");
++ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
+Objcopy_Name :=
+ new String'(Line (1 .. Last - 7) & "objcopy");
+ end if;
+@@ -2241,7 +2243,13 @@
+Mapping_File_Name := new String'(Line (1 .. Last));
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 5b53b3aeda670af51207cb04b9fe5ca4c9c430e3
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed May 12 19:00:38 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed May 12 19:00:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b53b3ae
dev-ada/gprbuild: support gnat_2020
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/Manifest | 2 -
dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch | 274 -
...uild-2019-r1.ebuild => gprbuild-2020-r1.ebuild} | 18 +-
3 files changed, 9 insertions(+), 285 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index f7e381e3e4e..3ee032d60e9 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,6 +1,4 @@
-DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B
0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90
SHA512
0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B
3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a
SHA512
d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B
e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8
SHA512
f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B
e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147
SHA512
e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
diff --git a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
deleted file mode 100644
index 352ff033b81..000
--- a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
+++ /dev/null
@@ -1,274 +0,0 @@
a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200
-+++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200
-@@ -266,7 +266,9 @@
-
-Driver_Name : Name_Id := No_Name;
-
-- Gnatbind_Name : String_Access := new String'("gnatbind");
-+ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
-+
-+ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
-
-Compiler_Name : String_Access := new String'("gcc");
-
-@@ -2081,7 +2083,7 @@
- and then Line (Last - 2 .. Last) = "gcc"
- then
-Gnatbind_Name :=
-- new String'(Line (1 .. Last - 3) & "gnatbind");
-+ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
-Objcopy_Name :=
- new String'(Line (1 .. Last - 3) & "objcopy");
-
-@@ -2089,7 +2091,7 @@
- and then Line (Last - 6 .. Last) = "gcc.exe"
- then
-Gnatbind_Name :=
-- new String'(Line (1 .. Last - 7) & "gnatbind");
-+ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
-Objcopy_Name :=
- new String'(Line (1 .. Last - 7) & "objcopy");
- end if;
-@@ -2241,7 +2243,13 @@
-Mapping_File_Name := new String'(Line (1 .. Last));
-
- when Binding_Options =>
-- Binding_Options_Table.Append (Line (1 .. Last));
-+ if Last > Gnatbind_Path_Option'Length
-+ and then Line (1 .. Gnatbind_Path_Option'Length) =
-+ Gnatbind_Path_Option then
-+ null;
-+ else
-+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 81d8a41b6692c82b5b46b05e817c8a741bdb1318
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Jun 9 11:36:38 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Jun 9 11:36:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d8a41b
dev-ada/gprbuild: version bump to 2020
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/Manifest | 2 +
dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch | 274 ++
dev-ada/gprbuild/gprbuild-2020.ebuild | 79 +++
3 files changed, 355 insertions(+)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 492408c6c4b..ed748ce42b2 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,6 @@
+DIST
408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz
2489399 BLAKE2B
3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a
SHA512
d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B
0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90
SHA512
0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B
e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8
SHA512
f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
+DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B
e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147
SHA512
e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
new file mode 100644
index 000..66ec4f7f0dd
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
@@ -0,0 +1,274 @@
+--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200
b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200
+@@ -266,7 +266,9 @@
+
+Driver_Name : Name_Id := No_Name;
+
+- Gnatbind_Name : String_Access := new String'("gnatbind");
++ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
++
++ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
+
+Compiler_Name : String_Access := new String'("gcc");
+
+@@ -2081,7 +2083,7 @@
+ and then Line (Last - 2 .. Last) = "gcc"
+ then
+Gnatbind_Name :=
+- new String'(Line (1 .. Last - 3) & "gnatbind");
++ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
+Objcopy_Name :=
+ new String'(Line (1 .. Last - 3) & "objcopy");
+
+@@ -2089,7 +2091,7 @@
+ and then Line (Last - 6 .. Last) = "gcc.exe"
+ then
+Gnatbind_Name :=
+- new String'(Line (1 .. Last - 7) & "gnatbind");
++ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
+Objcopy_Name :=
+ new String'(Line (1 .. Last - 7) & "objcopy");
+ end if;
+@@ -2241,7 +2243,13 @@
+Mapping_File_Name := new String'(Line (1 .. Last));
+
+ when Binding_Options =>
+- Binding_Options_Table.Append (Line (1 .. Last));
++ if Last > Gnatbind_Path_Option'Length
++ and then Line (1 .. Gnatbind_Path_Option'Length) =
++ Gnatbind_Path_Option then
++ null;
++
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: b851df513cc39a2268329423365e48bddcb758e0
Author: Tupone Alfredo gentoo org>
AuthorDate: Mon Nov 26 20:55:48 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Nov 26 20:55:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b851df51
dev-ada/gprbuild: Fix build with -Wl,-r
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2017-config.patch | 4 ++--
dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 6 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
index cb37dd58dd2..5dcd58ffb21 100644
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
@@ -107,7 +107,7 @@
null;
when others =>
- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc",
"-nostdlib", "-Wl,-r", "-o");
-+ for Library_Partial_Linker use
("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
++ for Library_Partial_Linker use
("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
end case;
@@ -116,7 +116,7 @@
- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc",
"-nostdlib", "-Wl,-r", "-o");
-+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@",
"-nostdlib", "-Wl,-r", "-o");
++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@",
"-nostdlib", "-Wl,-r", "-no-pie", "-o");
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
index df5101ac4bf..d279f478a5e 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -50,6 +50,12 @@ src_prepare() {
-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
src/gprlib.adb \
|| die
+ if use gnat_2016; then
+ sed -i \
+ -e 's:"-no-pie", ::g' \
+ share/gprconfig/linker.xml \
+ || die
+ fi
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: e7d7485e2922d66450f2cecbc8967f81f168646b
Author: Tupone Alfredo gentoo org>
AuthorDate: Sat Oct 27 20:27:04 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Oct 27 20:27:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d7485e
dev-ada/gprbuild: Fix configuration for 2017 version too
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2017-config.patch | 113 ++
dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 89 +
2 files changed, 202 insertions(+)
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
new file mode 100644
index 000..72f1fd829c1
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
@@ -0,0 +1,113 @@
+--- a/share/gprconfig/compilers.xml2018-10-27 09:04:53.830077299 +0200
b/share/gprconfig/compilers.xml2018-10-27 09:05:14.883724079 +0200
+@@ -20,15 +20,15 @@
+
+
+ GCC
+-(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc
++(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@
+
+- ${PREFIX}gcc -v
++ ${PREFIX}gcc-@VER@ -v
+
+
+
+ C
+
+- ${PREFIX}gcc -dumpmachine
++ ${PREFIX}gcc-@VER@ -dumpmachine
+
+
+
+@@ -325,14 +325,14 @@
+-->
+
+ GNAT
+-(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls
++(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls-@VER@
+
+- ${PREFIX}gnatls -v --version
++ ${PREFIX}gnatls-@VER@ -v --version
+
+
+ Ada
+
+- ${PREFIX}gcc -v
++ ${PREFIX}gcc-@VER@ -v
+
+
+
+@@ -342,7 +342,7 @@
+\.\./$TARGET/lib/gnat/(.*)/adalib/
+
+
+- ${PREFIX}gcc -dumpmachine
++ ${PREFIX}gcc-@VER@ -dumpmachine
+
+
+
+@@ -509,21 +509,6 @@
+
+
+
+-
+-
+-LLVM
+-clang
+-
+- clang -v
+-
+-
+-C
+-
+- clang -dumpmachine
+-
+-
+-
+-
+
+
+ WINDRES
+--- a/share/gprconfig/gnat.xml 2018-10-27 09:38:31.615357671 +0200
b/share/gprconfig/gnat.xml 2018-10-27 09:40:54.603044560 +0200
+@@ -60,7 +60,7 @@
+_gnat;
+
+package Compiler is
+- for Driver ("Ada") use
"${PATH(ada)}${PREFIX(ada)}gcc";
++ for Driver ("Ada") use
"${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
+ for Language_Kind("Ada") use "unit_based";
+ for Dependency_Kind ("Ada") use "ALI_File";
+ for Leading_Required_Switches("Ada") use
+@@ -77,6 +77,9 @@
+ for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE";
+ for Driver ("Ada") use
+ "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
++ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
++ for Required_Switches ("Ada") use
++ Binder'Required_Switches ("Ada")
("--RTS=${RUNTIME_DIR(ada)}");
+end Binder;
+
+for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
+--- a/share/gprconfig/c.xml2018-10-27 09:42:01.327035277 +0200
b/share/gprconfig/c.xml2018-10-27 09:42:16.529803718 +0200
+@@ -14,7 +14,7 @@
+
+
+package Compiler is
+- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
++ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
+end Compiler;
+
+
+--- a/share/gprconfig/linker.xml 2018-10-27 09:43:17.934862859 +0200
b/share/gprconfig/linker.xml 2018-10-27 09:43:54.127304471 +0200
+@@ -742,7 +742,7 @@
+for Shared_Library_Suffix use ".sl";
+for Library_Auto_Init_Supported use "true";
+for Run_Path_Option use ("-Wl,+b,");
+- for Library_Partial_Linker use ("gcc", "-nostdlib", "-Wl,-r", "-o");
++ for Library_Partial_Linker use ("gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
+
+package Linker is
+ for Max_Command_Line_Length use "5000";
diff --git
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 41f88706dedf15129fff2b8fbd661cc529a0884f
Author: Tupone Alfredo gentoo org>
AuthorDate: Sun Oct 14 18:52:01 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Oct 14 18:52:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f88706
dev-ada/gprbuild: C files compiled only with gnat provided compiler
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2018.xml | 93
dev-ada/gprbuild/gprbuild-2018-r1.ebuild | 89 ++
2 files changed, 182 insertions(+)
diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml
b/dev-ada/gprbuild/files/gprbuild-2018.xml
new file mode 100644
index 000..56c4f896919
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2018.xml
@@ -0,0 +1,93 @@
+
+
+
+GNAT-@VER@
+gnatls-@VER@
+
+ ${PREFIX}gnatls-@VER@ -v --version
+
+
+Ada
+
+ ${PREFIX}gcc-@VER@ -v
+
+
+
+ \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/
+ \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path
+ \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/
+ \.\./$TARGET/lib/gnat/(.*)/adalib/
+
+
+ ${PREFIX}gcc-@VER@ -dumpmachine
+
+
+
+
+
+
+
+
+
+ package Compiler is
+ for Driver ("Ada") use
"${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
+ for Language_Kind("Ada") use "unit_based";
+ for Dependency_Kind ("Ada") use "ALI_File";
+ for Leading_Required_Switches("Ada") use
+ ("-c", "-x", "ada", "-gnatA")
+ Compiler'Leading_Required_Switches ("Ada");
+ for Mapping_File_Switches("Ada") use ("-gnatem=");
+ for Mapping_Spec_Suffix ("Ada") use "%s";
+ for Mapping_Body_Suffix ("Ada") use "%b";
+ for Config_File_Switches ("Ada") use ("-gnatec=");
+ for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE";
+ for Multi_Unit_Switches ("Ada") use ("-gnateI");
+ for Multi_Unit_Object_Separator ("Ada") use "~";
+ for Config_Body_File_Name ("Ada") use
+ "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");";
+ for Config_Spec_File_Name ("Ada") use
+ "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");";
+ for Config_Body_File_Name_Index ("Ada") use
+ "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"",
Index => %i);";
+ for Config_Spec_File_Name_Index ("Ada") use
+ "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"",
Index => %i);";
+ for Config_Body_File_Name_Pattern ("Ada") use
+ "pragma Source_File_Name_Project "
+ " (Body_File_Name => ""*%b"","
+ " Casing => %c,"
+ " Dot_Replacement => ""%d"");";
+ for Config_Spec_File_Name_Pattern ("Ada") use
+ "pragma Source_File_Name_Project "
+ " (Spec_File_Name => ""*%s"","
+ " Casing => %c,"
+ " Dot_Replacement => ""%d"");";
+ for Config_File_Unique("Ada") use "False";
+ for PIC_Option ("Ada") use ("-fPIC");
+ for Leading_Required_Switches ("Ada") use
+Compiler'Leading_Required_Switches ("Ada")
("--RTS=${RUNTIME_DIR(ada)}");
+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
+ for Leading_Required_Switches ("C") use
+("-c", "-x", "c") Compiler'Leading_Required_Switches ("C");
+ for Include_Switches_Via_Spec ("C") use ("cc1", "-I");
+ for Max_Command_Line_Length use "8192";
+ for Response_File_Format ("C") use "GCC_GNU";
+ for Dependency_Switches ("C") use ("-MMD", "-MF", "");
+ for PIC_Option ("C") use ("-fPIC");
+ end Compiler;
+
+ package Binder is
+ for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE";
+ for Driver ("Ada") use
+ "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
+ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
+ for Required_Switches ("Ada") use
+Binder'Required_Switches ("Ada") ("--RTS=${RUNTIME_DIR(ada)}");
+ end Binder;
+
+ for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
+
+for Runtime_Dir ("Ada") use "${RUNTIME_DIR(ada)}";
+ for Library_Encapsulated_Supported use "true";
+
+
+
diff --git a/dev-ada/gprbuild/gprbuild-2018-r1.ebuild
b/dev-ada/gprbuild/gprbuild-2018-r1.ebuild
new file mode 100644
index 000..3f325332e8e
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2018-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/;
+SRC_URI="
+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: e9989d791181545303167f7629934981ff99da4f
Author: Tupone Alfredo gentoo org>
AuthorDate: Thu Jun 22 20:02:02 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Jun 22 20:02:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9989d79
dev-ada/gprbuild: Add build tool instruction to gprbuild-2016
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-ada/gprbuild/files/gprbuild-2016.xml | 94
dev-ada/gprbuild/gprbuild-2016.ebuild| 11 +++-
2 files changed, 104 insertions(+), 1 deletion(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2016.xml
b/dev-ada/gprbuild/files/gprbuild-2016.xml
new file mode 100644
index 000..7d321e03b6a
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2016.xml
@@ -0,0 +1,94 @@
+
+
+
+GNAT-@VER@
+gnatmake-@VER@
+
+ ${PREFIX}gnatls-@VER@ -v --version
+
+
+Ada
+
+ ${PREFIX}gcc-@VER@ -v
+
+
+
+ \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/
+ \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path
+ \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/
+ \.\./$TARGET/lib/gnat/(.*)/adalib/
+
+
+ ${PREFIX}gcc-@VER@ -dumpmachine
+
+
+
+
+
+
+
+
+
+ package Naming is
+ for Spec_Suffix ("Ada") use ".ads";
+ for Body_Suffix ("Ada") use ".adb";
+ for Casing use "lowercase";
+ for Dot_Replacement use "-";
+ end Naming;
+
+ package Compiler is
+ for Driver ("Ada") use
"${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
+ for Language_Kind("Ada") use "unit_based";
+ for Dependency_Kind ("Ada") use "ALI_File";
+ for Leading_Required_Switches("Ada") use
+ ("-c", "-x", "ada", "-gnatA")
+ Compiler'Leading_Required_Switches ("Ada");
+ for Mapping_File_Switches("Ada") use ("-gnatem=");
+ for Mapping_Spec_Suffix ("Ada") use "%s";
+ for Mapping_Body_Suffix ("Ada") use "%b";
+ for Config_File_Switches ("Ada") use ("-gnatec=");
+ for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE";
+ for Multi_Unit_Switches ("Ada") use ("-gnateI");
+ for Multi_Unit_Object_Separator ("Ada") use "~";
+ for Config_Body_File_Name ("Ada") use
+ "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");";
+ for Config_Spec_File_Name ("Ada") use
+ "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");";
+ for Config_Body_File_Name_Index ("Ada") use
+ "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"",
Index => %i);";
+ for Config_Spec_File_Name_Index ("Ada") use
+ "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"",
Index => %i);";
+ for Config_Body_File_Name_Pattern ("Ada") use
+ "pragma Source_File_Name_Project "
+ " (Body_File_Name => ""*%b"","
+ " Casing => %c,"
+ " Dot_Replacement => ""%d"");";
+ for Config_Spec_File_Name_Pattern ("Ada") use
+ "pragma Source_File_Name_Project "
+ " (Spec_File_Name => ""*%s"","
+ " Casing => %c,"
+ " Dot_Replacement => ""%d"");";
+ for Config_File_Unique("Ada") use "False";
+ for PIC_Option ("Ada") use ("-fPIC");
+ end Compiler;
+
+ package Binder is
+ for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE";
+ for Driver ("Ada") use
+ "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
+ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
+ end Binder;
+
+ package Clean is
+ for Source_Artifact_Extensions ("Ada")
+ use (".dg", ".rep", ".stdout", ".stderr");
+ for Object_Artifact_Extensions ("Ada") use (".s", ".ci", ".gcno");
+ end Clean;
+
+ for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
+ for Runtime_Library_Dir ("Ada") use "${RUNTIME_DIR(ada)}/adalib/";
+ for Runtime_Source_Dirs ("Ada") use ("${RUNTIME_DIR(ada)}/adainclude/");
+ for Library_Encapsulated_Supported use "true";
+
+
+
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild
b/dev-ada/gprbuild/gprbuild-2016.ebuild
index a3691ac46ff..c880ef95b51 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -41,6 +41,13 @@ pkg_setup() {
fi
}
+src_prepare() {
+ gnatbase=$(basename ${GCC})
+ GCC_PV=${gnatbase#*gcc-}
+ sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
+ default
+}
+
src_configure() {
if ! use bootstrap ; then
default
@@ -78,9 +85,9 @@ src_compile() {
src_install() {
if use bootstrap; then
dobin ${bin_progs}
- insinto /usr/share/gprconfig
exeinto /usr/libexec/gprbuild
doexe ${lib_progs}
+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: c36f364ec4441c9786077e11754d6e1bf7d645b8
Author: Tupone Alfredo gentoo org>
AuthorDate: Sun May 7 20:20:50 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun May 7 20:20:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36f364e
dev-ada/gprbuild: Add dev-ada/gprbuild-
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-ada/gprbuild/files/gprbuild--gentoo.patch | 44 +
dev-ada/gprbuild/gprbuild-2016.ebuild | 7 +--
.../{gprbuild-2016.ebuild => gprbuild-.ebuild} | 55 --
3 files changed, 76 insertions(+), 30 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild--gentoo.patch
b/dev-ada/gprbuild/files/gprbuild--gentoo.patch
new file mode 100644
index 000..bebe795de96
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild--gentoo.patch
@@ -0,0 +1,44 @@
+--- gprbuild-/Makefile.old 2017-05-07 09:46:00.002669301 +0200
gprbuild-/Makefile 2017-05-07 09:47:37.832171592 +0200
+@@ -74,7 +74,8 @@
+ CLEANER=gprclean -q $(RBD)
+
+ GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
+- -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
++ -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS)
+ LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR)
+ LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) -XBUILD=${BUILD} \
+ --install-name=gpr --build-var=LIBRARY_TYPE $(GTARGET)
+@@ -136,15 +136,18 @@
+
+ libgpr.build.shared:
+ ${BUILDER} -XLIBRARY_TYPE=relocatable \
+- -XXMLADA_BUILD=relocatable $(GPR_GPR)
++ -XXMLADA_BUILD=relocatable $(GPR_GPR) \
++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS)
+
+ libgpr.build.static:
+ ${BUILDER} -XLIBRARY_TYPE=static \
+- -XXMLADA_BUILD=static $(GPR_GPR)
++ -XXMLADA_BUILD=static $(GPR_GPR) \
++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS)
+
+ libgpr.build.static-pic:
+ ${BUILDER} -XLIBRARY_TYPE=static-pic \
+- -XXMLADA_BUILD=static-pic $(GPR_GPR)
++ -XXMLADA_BUILD=static-pic $(GPR_GPR) \
++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS)
+
+ libgpr.install: libgpr.uninstall $(foreach t, $(LIBGPR_TYPES),
libgpr.install.$(t))
+
+--- gprbuild-/gpr/gpr.gpr.old 2017-05-07 10:00:30.688087076 +0200
gprbuild-/gpr/gpr.gpr 2017-05-07 10:00:45.028863862 +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;
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild
b/dev-ada/gprbuild/gprbuild-2016.ebuild
index 23de5cb3e94..b021ddc6047 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -32,12 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
pkg_setup() {
GCC=${ADA:-$(tc-getCC)}
- local base=$(basename ${GCC})
- GNATMAKE="${base/gcc/gnatmake}"
- if [[ ${base} != ${GCC} ]] ; then
- local path=$(dirname ${GCC})
- GNATMAKE="${path}/${GNATMAKE}"
- fi
+ GNATMAKE="${GCC/gcc/gnatmake}"
if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
eerror "You need a gcc compiler that provides the Ada Compiler:"
eerror "1) use gcc-config to select the right compiler or"
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild
b/dev-ada/gprbuild/gprbuild-.ebuild
similarity index 72%
copy from dev-ada/gprbuild/gprbuild-2016.ebuild
copy to dev-ada/gprbuild/gprbuild-.ebuild
index 23de5cb3e94..39a26f1a7e4 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-.ebuild
@@ -3,41 +3,34 @@
EAPI=6
-inherit toolchain-funcs multiprocessing
+inherit git-r3 toolchain-funcs multiprocessing
MYP=${PN}-gpl-${PV}
DESCRIPTION="Multi-Language Management"
HOMEPAGE="http://libre.adacore.com/;
SRC_URI="
- http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
- -> ${MYP}-src.tar.gz
bootstrap? (
http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
- -> xmlada-gpl-${PV}-src.tar.gz )"
+ -> xmlada-gpl-2016-src.tar.gz )"
+EGIT_REPO_URI="https://github.com/AdaCore/gprbuild.git;
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
IUSE="bootstrap +shared static static-pic"
DEPEND="dev-lang/gnat-gpl
+ >=dev-python/sphinx-1.5.2
!bootstrap? ( dev-ada/xmlada )"
RDEPEND="${DEPEND}"
-S="${WORKDIR}"/${MYP}-src
-
REQUIRED_USE="bootstrap? ( !shared !static !static-pic )"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
pkg_setup() {
GCC=${ADA:-$(tc-getCC)}
- local base=$(basename ${GCC})
- GNATMAKE="${base/gcc/gnatmake}"
- if [[ ${base} != ${GCC} ]] ; then
- local path=$(dirname ${GCC})
-
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 46dba86bc79018ffa1157f9f06e598de481ebb66
Author: Tupone Alfredo gentoo org>
AuthorDate: Wed Mar 29 19:27:24 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Mar 29 19:27:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46dba86b
dev-ada/gprbuild: Now that dev-ada/xmlada is in, use it to build
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 54 +
dev-ada/gprbuild/gprbuild-2016.ebuild | 74 +++
dev-ada/gprbuild/metadata.xml | 11 +++-
3 files changed, 113 insertions(+), 26 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
index 952c2c0a69d..f3566e87adb 100644
--- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -160,3 +160,57 @@ diff -Naur
gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu
+pragma Convention (C, Sigint_Intercepted);
+-- Called when the program is interrupted by Ctrl-C to delete the
+-- temporary mapping files and configuration pragmas files.
+--- gprbuild-gpl-2016-src/Makefile.in.old 2017-01-19 19:52:41.242907252
+0100
gprbuild-gpl-2016-src/Makefile.in 2017-01-19 19:54:45.822646333 +0100
+@@ -25,12 +25,12 @@
+ host=@host@
+ target=@target@
+ build=@build@
+-prefix=@prefix@
++prefix=$(DESTDIR)@prefix@
+ srcdir=@srcdir@
+ objdir=@objdir@
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+-datadir=@datadir@
++datadir=$(DESTDIR)@datadir@
+ bindir=@bindir@
+ libdir=@libdir@
+ libexecdir=@libexecdir@
+@@ -66,7 +66,7 @@
+ .PHONY: all distall gprbuild gprconfig gprclean gprinstall gprname gprls
+
+ all:
+- $(GPRBUILD_BUILDER)
++ $(GPRBUILD_BUILDER) -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS)
+
+ distall: all install install.dist
+
+@@ -173,13 +173,13 @@
+ libgpr.build: $(foreach t, $(LIBGPR_TYPES), libgpr.build.$(t))
+
+ libgpr.build.shared:
+- ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr
++ ${BUILDER} -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)
+
+ 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)
+
+ libgpr.install: $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t))
+
+--- gprbuild-gpl-2015-src/gprbuild.gpr.old 2017-01-11 21:44:59.795997896
+0100
gprbuild-gpl-2015-src/gprbuild.gpr 2017-01-11 21:45:07.971998651 +0100
+@@ -66,6 +66,7 @@
+ for Switches ("gpr*.ad?") use
+ Compiler'Default_Switches ("Ada") & ("-g1");
+ end case;
++ for Driver ("C") use External ("CC", "gcc");
+end Compiler;
+
+package Binder is
+ make BUILDER="$(BUILDER)" BUILD="$(BUILD)"
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild
b/dev-ada/gprbuild/gprbuild-2016.ebuild
index 03d3c2baa53..2fe32aa1093 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -12,19 +12,22 @@ HOMEPAGE="http://libre.adacore.com/;
SRC_URI="
http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
-> ${MYP}-src.tar.gz
- http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
- -> xmlada-gpl-${PV}-src.tar.gz"
+ bootstrap? (
+ http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
+ -> xmlada-gpl-${PV}-src.tar.gz )"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+IUSE="bootstrap +shared static static-pic"
-DEPEND="dev-lang/gnat-gpl"
+DEPEND="dev-lang/gnat-gpl
+ !bootstrap? ( dev-ada/xmlada )"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/${MYP}-src
+REQUIRED_USE="bootstrap? ( !shared !static !static-pic )"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
pkg_setup() {
@@ -44,34 +47,55 @@ pkg_setup() {
}
src_configure() {
- :
+ if ! use bootstrap ; then
+ default
+ fi
}
bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
lib_progs="gprlib gprbind"
src_compile() {
- local xmlada_src="../xmlada-gpl-${PV}-src"
- incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
- -I${xmlada_src}/schema -I${xmlada_src}/unicode \
- -I${xmlada_src}/input_sources"
- ${GCC} -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o || die
- for bin in ${bin_progs}; do
- ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS
${bin}-main \
- -o ${bin} -largs gpr_imports.o || die
- done
- for lib in $lib_progs; do
- ${GNATMAKE} -j$(makeopts_jobs)
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 5aba73dd0d66c48ba20fc55151156ca1492c4549
Author: Tupone Alfredo gentoo org>
AuthorDate: Tue Mar 28 07:40:26 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Mar 28 07:41:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aba73dd
dev-ada/gprbuild: Fix executable stack
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 162 ++
dev-ada/gprbuild/gprbuild-2016.ebuild | 8 +-
2 files changed, 167 insertions(+), 3 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
new file mode 100644
index 000..952c2c0a69d
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -0,0 +1,162 @@
+diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-main.adb
gprbuild-gpl-2016-src/src/gprbuild-main.adb
+--- gprbuild-gpl-2016-src.old/src/gprbuild-main.adb2017-03-28
09:12:24.205058242 +0200
gprbuild-gpl-2016-src/src/gprbuild-main.adb2017-03-28
09:21:20.495344963 +0200
+@@ -52,7 +52,8 @@
+ with GPR.Tempdir;use GPR.Tempdir;
+ with GPR.Tree; use GPR.Tree;
+ with GPR.Util; use GPR.Util;
++with Gprbuild.Sigint_Intercepted;
+
+ procedure Gprbuild.Main is
+
+use Stamps;
+@@ -124,11 +124,6 @@
+pragma Import (C, Install_Int_Handler, "__gnat_install_int_handler");
+-- Called by Gnatmake to install the SIGINT handler below
+
+- procedure Sigint_Intercepted;
+- pragma Convention (C, Sigint_Intercepted);
+- -- Called when the program is interrupted by Ctrl-C to delete the
+- -- temporary mapping files and configuration pragmas files.
+-
+No_Object_Check_Switch : constant String := "--no-object-check";
+Direct_Import_Only_Switch : constant String := "--direct-import-only";
+Indirect_Imports_Switch: constant String := "--indirect-imports";
+@@ -1616,22 +1611,6 @@
+ end if;
+end Scan_Arg;
+
+-
+- -- Sigint_Intercepted --
+-
+-
+- procedure Sigint_Intercepted is
+- begin
+- Put_Line ("*** Interrupted ***");
+- Delete_All_Temp_Files (Project_Tree.Shared);
+-
+- if Distributed_Mode then
+- Compilation.Slave.Unregister_Remote_Slaves (From_Signal => True);
+- end if;
+-
+- OS_Exit (1);
+- end Sigint_Intercepted;
+-
+
+-- Initialize --
+
+@@ -2293,7 +2272,7 @@
+
+-- And install Ctrl-C handler
+
+- Install_Int_Handler (Sigint_Intercepted'Unrestricted_Access);
++ Install_Int_Handler (Gprbuild.Sigint_Intercepted'Unrestricted_Access);
+
+-- Check command line arguments. These will be overridden when looking
+-- for the configuration file
+diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.adb
gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.adb
+--- gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.adb
1970-01-01 01:00:00.0 +0100
gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.adb 2017-03-28
09:20:00.661792854 +0200
+@@ -0,0 +1,20 @@
++
++-- Sigint_Intercepted --
++
++
++with Ada.Text_IO; use Ada.Text_IO;
++with Gpr_Util; use Gpr_Util;
++with Gprbuild.Compile;
++with Gprbuild.Compilation.Slave;
++
++procedure Gprbuild.Sigint_Intercepted is
++begin
++ Put_Line ("*** Interrupted ***");
++ Delete_All_Temp_Files (Project_Tree.Shared);
++
++ if Distributed_Mode then
++ Compilation.Slave.Unregister_Remote_Slaves (From_Signal => True);
++ end if;
++
++ OS_Exit (1);
++end Gprbuild.Sigint_Intercepted;
+diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.ads
gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.ads
+--- gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.ads
1970-01-01 01:00:00.0 +0100
gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.ads 2017-03-28
09:15:35.275616543 +0200
+@@ -0,0 +1,4 @@
++procedure Gprbuild.Sigint_Intercepted;
++pragma Convention (C, Sigint_Intercepted);
++-- Called when the program is interrupted by Ctrl-C to delete the
++-- temporary mapping files and configuration pragmas files.
+diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-main.adb
gprbuild-gpl-2016-src/src/gprinstall-main.adb
+--- gprbuild-gpl-2016-src.old/src/gprinstall-main.adb 2017-03-28
09:12:24.205058242 +0200
gprbuild-gpl-2016-src/src/gprinstall-main.adb 2017-03-28
09:25:36.515709886 +0200
+@@ -42,6 +42,7 @@
+ with Gprinstall.DB;
+ with Gprinstall.Install;
+ with Gprinstall.Uninstall;
++with Gprinstall.Sigint_Intercepted;
+
+ procedure Gprinstall.Main is
+
+@@ -94,11 +94,6 @@
+pragma Import (C, Install_Int_Handler, "__gnat_install_int_handler");
+-- Called by Gnatmake to install the SIGINT handler below
+
+-
