[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 78594100b1bcf3d4d1cce003cee47d02443c3f1c
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Feb 2 08:03:27 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Feb 2 08:22:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78594100
dev-ada/gprbuild: drop 22.0.0-r4
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/Manifest | 2 -
dev-ada/gprbuild/files/gprbuild-2021-runpath.patch | 11
dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild | 68 --
3 files changed, 81 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index fd032b1bc3ce..3d698cb5a410 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,2 @@
-DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B
4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d
SHA512
7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B
a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508
SHA512
d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5
-DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B
cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9
SHA512
7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B
4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f
SHA512
a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
deleted file mode 100644
index 9224a09f9049..
--- a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
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-22.0.0-r4.ebuild
b/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild
deleted file mode 100644
index e525376e58fd..
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-
-inherit ada multiprocessing
-
-XMLADA=xmlada-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/;
-SRC_URI="
- https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz
- https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
- -> ${XMLADA}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${ADA_DEPS}
- ~dev-ada/gprconfig_kb-${PV}[${ADA_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${PN}-2021-runpath.patch
-)
-
-src_prepare() {
- default
- sed -i \
- -e "s:@GNATBIND@:${GNATBIND}:g" \
- src/gprlib.adb \
- || die
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
- local xmlada_src="../${XMLADA}"
- 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} gpr/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 ${LDFLAGS} gpr_imports.o || die
- done
- for lib in $lib_progs; do
- gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
- -largs ${LDFLAGS} gpr_imports.o || die
- done
-}
-
-src_install() {
- dobin ${bin_progs}
- exeinto /usr/libexec/gprbuild
- doexe ${lib_progs}
- insinto /usr/share/gpr
- doins share/_default.gpr
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: edbcf396d0d83b65977186af2a5c530e2b5df30a
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Nov 24 20:25:31 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Nov 24 20:26:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbcf396
dev-ada/gprbuild: separate gprconfig_kb
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/Manifest | 1 -
dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch | 47
.../gprbuild/files/gprbuild-22.0.0-gentoo.patch| 246 -
...-22.0.0-r2.ebuild => gprbuild-22.0.0-r3.ebuild} | 41 +---
4 files changed, 4 insertions(+), 331 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index adc6ed460a2d..408939bb5cc6 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,5 +1,4 @@
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-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-2020.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
deleted file mode 100644
index ba5c2f858de7..
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
+++ /dev/null
@@ -1,47 +0,0 @@
a/gpr/src/gpr_imports.c2022-02-27 10:10:34.053638209 +0100
-+++ b/gpr/src/gpr_imports.c2022-02-27 10:12:03.898276758 +0100
-@@ -114,6 +114,44 @@
- const char *__gnat_default_libgcc_subdir = "lib";
- #endif
-
-+#include
-+#include
-+#include
-+#include
-+
-+ extern long long __gnat_file_time(char* name)
-+ {
-+long long result;
-+
-+if (name == NULL) {
-+ return LLONG_MIN;
-+}
-+/* Number of seconds between and . */
-+static const long long ada_epoch_offset = (136 * 365 + 44 * 366) *
86400LL;
-+struct stat sb;
-+if (stat(name, ) != 0) {
-+ return LLONG_MIN;
-+}
-+
-+// return (sb.st_mtim.tv_sec - ada_epoch_offset) * 1E9
-+// + sb.st_mtim.tv_nsec;
-+// with check overflow below
-+
-+if (__builtin_ssubll_overflow(sb.st_mtim.tv_sec, ada_epoch_offset,
)) {
-+ return LLONG_MIN;
-+}
-+
-+if (__builtin_smulll_overflow(result, 1E9, )) {
-+ return LLONG_MIN;
-+}
-+
-+if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, )) {
-+ return LLONG_MIN;
-+}
-+
-+return result;
-+ }
-+
- #ifdef __cplusplus
- }
- #endif
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
index a974d18c4144..3decc264638e 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch
@@ -44,249 +44,3 @@
when Copy_Source_Dir =>
Copy_Source_Directory := new String'(Line (1 .. Last));
a/share/gprconfig/compilers.xml2019-06-01 21:29:57.611722804 +0200
-+++ b/share/gprconfig/compilers.xml2019-06-01 21:42:56.000608601 +0200
-@@ -20,15 +20,15 @@
-
-
- GCC
--(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc
-+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: c8c82bae8e84eed2f7692a228e6306febec0e7c5
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Feb 27 09:52:17 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Feb 27 09:52:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c82bae
dev-ada/gprbuild: adding compatibility with gnat_2020
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch | 47 +++
dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild| 16 +++-
2 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
new file mode 100644
index ..ba5c2f858de7
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
@@ -0,0 +1,47 @@
+--- a/gpr/src/gpr_imports.c2022-02-27 10:10:34.053638209 +0100
b/gpr/src/gpr_imports.c2022-02-27 10:12:03.898276758 +0100
+@@ -114,6 +114,44 @@
+ const char *__gnat_default_libgcc_subdir = "lib";
+ #endif
+
++#include
++#include
++#include
++#include
++
++ extern long long __gnat_file_time(char* name)
++ {
++long long result;
++
++if (name == NULL) {
++ return LLONG_MIN;
++}
++/* Number of seconds between and . */
++static const long long ada_epoch_offset = (136 * 365 + 44 * 366) *
86400LL;
++struct stat sb;
++if (stat(name, ) != 0) {
++ return LLONG_MIN;
++}
++
++// return (sb.st_mtim.tv_sec - ada_epoch_offset) * 1E9
++// + sb.st_mtim.tv_nsec;
++// with check overflow below
++
++if (__builtin_ssubll_overflow(sb.st_mtim.tv_sec, ada_epoch_offset,
)) {
++ return LLONG_MIN;
++}
++
++if (__builtin_smulll_overflow(result, 1E9, )) {
++ return LLONG_MIN;
++}
++
++if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, )) {
++ return LLONG_MIN;
++}
++
++return result;
++ }
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 06eb16e01235..97506af95abf 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-ADA_COMPAT=( gnat_2021 )
+ADA_COMPAT=( gnat_202{0,1} )
inherit ada multiprocessing
@@ -53,6 +53,18 @@ src_prepare() {
-e "s:@GNATBIND@:${GNATBIND}:g" \
src/gprlib.adb \
|| die
+ if use ada_target_gnat_2020; then
+ sed -i \
+ -e "s:Append_Vector:Append:g" \
+ -e "s:Insert_Vector:Insert:g" \
+ src/gprbuild-link.adb \
+ src/gprinstall-install.adb \
+ src/gprlib.adb \
+ src/gprlib-build_shared_lib.adb \
+ src/gprbind.adb \
+ || die
+ eapply "${FILESDIR}"/${P}-2020.patch
+ fi
}
bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 778901b50d7e1b0f09ff48274db2de8229a1d503
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Dec 23 07:23:25 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Dec 23 07:53:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778901b5
dev-ada/gprbuild: use AR or NM env instead
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 ---
dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 5 +++--
dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 5 +++--
dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch | 5 +++--
dev-ada/gprbuild/gprbuild-2021-r2.ebuild| 2 +-
5 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
deleted file mode 100644
index 77f0cfead7ed..
--- a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100
-+++ b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100
-@@ -864,7 +864,7 @@
-
-
-
-- for Archive_Builder use ("ar", "cr");
-+ for Archive_Builder use ("${HOST(Ada)}-ar", "cr");
-for Archive_Builder_Append_Option use ("q");
-for Archive_Indexer use ("ranlib");
-for Archive_Suffix use ".a";
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
index 2bf41a8e1b07..9fcab1565857 100644
--- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@@ -1,11 +1,12 @@
--- a/share/gprconfig/linker.xml 2021-12-21 21:36:45.306813518 +0100
+++ b/share/gprconfig/linker.xml 2021-12-21 22:20:21.642668870 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
- for Object_Lister use ("nm", "-g");
-+ for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++ NM := External("NM", "nm");
++ for Object_Lister use (NM, "-g");
for Object_Lister_Matcher use " [TDRB] (.*)";
LDFLAGS := External_As_List ("LDFLAGS", " ");
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
index 452733493ace..6a9513473bf9 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
@@ -1,11 +1,12 @@
--- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100
+++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100
-@@ -877,7 +877,7 @@
+@@ -877,7 +877,8 @@
- for Archive_Builder use ("ar", "cr");
-+ for Archive_Builder use ("${HOST(Ada)}-ar", "cr");
++ AR := External("AR", "ar");
++ for Archive_Builder use (AR, "cr");
for Archive_Builder_Append_Option use ("q");
for Archive_Indexer use ("ranlib");
for Archive_Suffix use ".a";
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
index 4455e8befffa..062d7960fce7 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@@ -1,11 +1,12 @@
--- a/share/gprconfig/linker.xml 2021-12-21 22:36:01.054738486 +0100
+++ b/share/gprconfig/linker.xml 2021-12-21 22:36:59.973738600 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
- for Object_Lister use ("nm", "-g");
-+ for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++ NM := External("NM", "nm");
++ for Object_Lister use (NM, "-g");
for Object_Lister_Matcher use " [TDRB] (.*)";
package Linker is
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 405996ac11c4..8bfc6af4419b 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
- "${FILESDIR}"/${P}-ar.patch
+ "${FILESDIR}"/${PN}-22.0.0-ar.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Dec 22 21:53:03 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Dec 22 21:53:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f80ac2e
dev-ada/gprbuild: use chost-ar
Closes: https://bugs.gentoo.org/829701
Closes: https://bugs.gentoo.org/736036
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 +++
dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 11 +++
dev-ada/gprbuild/gprbuild-2021-r2.ebuild| 1 +
dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild | 1 +
4 files changed, 24 insertions(+)
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
new file mode 100644
index ..77f0cfead7ed
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100
b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100
+@@ -864,7 +864,7 @@
+
+
+
+- for Archive_Builder use ("ar", "cr");
++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr");
+for Archive_Builder_Append_Option use ("q");
+for Archive_Indexer use ("ranlib");
+for Archive_Suffix use ".a";
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
new file mode 100644
index ..452733493ace
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100
b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100
+@@ -877,7 +877,7 @@
+
+
+
+- for Archive_Builder use ("ar", "cr");
++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr");
+for Archive_Builder_Append_Option use ("q");
+for Archive_Indexer use ("ranlib");
+for Archive_Suffix use ".a";
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 40a16cb9b2d4..405996ac11c4 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
+ "${FILESDIR}"/${P}-ar.patch
)
src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 2a07d5e4d71d..06eb16e01235 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-nm.patch
+ "${FILESDIR}"/${P}-ar.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: f62537c112bcf92c8e243e06a4b0a109b5c631d1
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue Dec 21 21:50:00 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Dec 21 21:50:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62537c1
dev-ada/gprbuild: use ${CHOST}-nm
Closes: https://bugs.gentoo.org/829656
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 11
dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch| 11
...build-22.0.0.ebuild => gprbuild-2021-r2.ebuild} | 33 ++
...ild-22.0.0.ebuild => gprbuild-22.0.0-r1.ebuild} | 5 +++-
4 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
new file mode 100644
index ..2bf41a8e1b07
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml 2021-12-21 21:36:45.306813518 +0100
b/share/gprconfig/linker.xml 2021-12-21 22:20:21.642668870 +0100
+@@ -128,7 +128,7 @@
+
+
+
+- for Object_Lister use ("nm", "-g");
++ for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+for Object_Lister_Matcher use " [TDRB] (.*)";
+
+LDFLAGS := External_As_List ("LDFLAGS", " ");
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
new file mode 100644
index ..4455e8befffa
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml 2021-12-21 22:36:01.054738486 +0100
b/share/gprconfig/linker.xml 2021-12-21 22:36:59.973738600 +0100
+@@ -128,7 +128,7 @@
+
+
+
+- for Object_Lister use ("nm", "-g");
++ for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+for Object_Lister_Matcher use " [TDRB] (.*)";
+
+package Linker is
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild
b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
similarity index 71%
copy from dev-ada/gprbuild/gprbuild-22.0.0.ebuild
copy to dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 6de6ca467e32..40a16cb9b2d4 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -3,22 +3,21 @@
EAPI=7
-ADA_COMPAT=( gnat_2021 )
+ADA_COMPAT=( gnat_202{0..1} )
inherit ada multiprocessing
-XMLADA=xmlada-${PV}
-GPRCONFIG_KB=gprconfig_kb-${PV}
+MYP=${P}-${PV}0519-19A34-src
+ID=23a77a37247ff811609e23a0a271f445c299fc8f
+XMLADA=xmlada-${PV}-${PV}0518-19D50-src
+XMLADAID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79
+ADAMIRROR=https://community.download.adacore.com/v1
DESCRIPTION="Multi-Language Management"
HOMEPAGE="http://libre.adacore.com/;
SRC_URI="
- https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz
- https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
- -> ${XMLADA}.tar.gz
- https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v${PV}.tar.gz
- -> ${GPRCONFIG_KB}.tar.gz"
+ ${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
+ ${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -27,16 +26,15 @@ IUSE=""
DEPEND="${ADA_DEPS}"
RDEPEND="${DEPEND}"
+S="${WORKDIR}"/${MYP}
+
REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-nm.patch
+)
src_prepare() {
- kb_src=../${GPRCONFIG_KB}
-
- # Install the gprconfig knowledge base
- rm -rf share/gprconfig
- cp -r "$kb_src"/db share/gprconfig || die
-
default
sed -i \
-e "s:@VER@:${GCC_PV}:g" \
@@ -75,8 +73,7 @@ src_install() {
exeinto /usr/libexec/gprbuild
doexe ${lib_progs}
insinto /usr/share/gprconfig
- doins share/gprconfig/*.xml
- doins share/gprconfig/*.ent
+ doins share/gprconfig/*
insinto /usr/share/gpr
doins share/_default.gpr
einstalldocs
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild
b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
similarity index 96%
rename from dev-ada/gprbuild/gprbuild-22.0.0.ebuild
rename to dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 6de6ca467e32..2a07d5e4d71d 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -28,7 +28,10 @@ DEPEND="${ADA_DEPS}"
RDEPEND="${DEPEND}"
REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-nm.patch
+)
src_prepare() {
kb_src=../${GPRCONFIG_KB}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: bc872e0005084c5c0262d239efc504a2b75c16fd
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Jun 5 13:30:42 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jun 5 13:30:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc872e00
dev-ada/gprbuild: drop gnat_2016
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-2017-config.patch | 122 --
dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 94 -
dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 85 ---
4 files changed, 303 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index b1f5e6eda06..b5542ae5b4d 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,6 +1,4 @@
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-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
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-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
deleted file mode 100644
index 5dcd58ffb21..000
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ /dev/null
@@ -1,122 +0,0 @@
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
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 684579cabe8b97ec395650d1ec892b9ad9796dd2
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon May 31 08:42:20 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon May 31 08:42:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684579ca
dev-ada/gprbuild: fix gnat discovery
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 8 +++-
.../gprbuild/{gprbuild-2021.ebuild => gprbuild-2021-r1.ebuild}| 0
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
index ac61f561785..15264d6828e 100644
--- a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
@@ -65,7 +65,7 @@
-@@ -185,9 +185,9 @@
+@@ -185,14 +185,14 @@
-->
GNAT
@@ -77,6 +77,12 @@
Ada
+
+- ${PREFIX}gcc -v
++ ${PREFIX}gcc-@VER@ -v
+
+
+
@@ -202,68 +202,11 @@
\.\./$TARGET/lib/gnat/(.*)/adalib/
diff --git a/dev-ada/gprbuild/gprbuild-2021.ebuild
b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild
similarity index 100%
rename from dev-ada/gprbuild/gprbuild-2021.ebuild
rename to dev-ada/gprbuild/gprbuild-2021-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: ae86b692a753c84529aa35c07f435a2621cb9128
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun May 30 13:54:21 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun May 30 13:54:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae86b692
dev-ada/gprbuild: bump to 2021
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-2021-gentoo.patch | 286 ++
dev-ada/gprbuild/gprbuild-2021.ebuild | 76 ++
3 files changed, 364 insertions(+)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 3ee032d60e9..b1f5e6eda06 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,6 @@
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-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
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-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
new file mode 100644
index 000..ac61f561785
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
@@ -0,0 +1,286 @@
+--- 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
++ Binding_Options_Table.Append
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 66c86278b6d3667532d4a1c8a99b842b99d940ec
Author: Tupone Alfredo gentoo org>
AuthorDate: Tue Aug 27 07:03:32 2019 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Aug 27 07:03:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c86278
dev-ada/gprbuild: remove unused version
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Alfredo Tupone gentoo.org>
dev-ada/gprbuild/Manifest | 2 -
dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 284 --
dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 86 ---
dev-ada/gprbuild/gprbuild-2018-r4.ebuild | 89 ---
4 files changed, 461 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 06e3942bc69..492408c6c4b 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-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B
b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab
SHA512
d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B
e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8
SHA512
f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B
11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1
SHA512
8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
deleted file mode 100644
index 34936ea1f52..000
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ /dev/null
@@ -1,284 +0,0 @@
a/gpr/gpr.gpr 2017-05-27 20:59:07.061135892 +0200
-+++ b/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;
a/gpr/src/gpr-names.ads2017-11-19 13:09:18.947527738 +0100
-+++ b/gpr/src/gpr-names.ads2017-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);
a/gpr/src/gpr-names.adb2017-11-19 13:10:27.674316703 +0100
-+++ b/gpr/src/gpr-names.adb2017-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;
-
a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100
-+++ b/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");
a/src/gprlib.adb 2017-12-18 12:20:02.937317216 +0100
-+++ b/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100
-@@ -263,7 +263,9 @@
-
-Driver_Name : Name_Id := No_Name;
-
-- Gnatbind_Name : String_Access := new String'("gnatbind");
-+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 0f1f8f502c96495a9abe50a6edf0ab07924125a6
Author: Tupone Alfredo gentoo org>
AuthorDate: Sun Jun 2 16:50:56 2019 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 2 16:50:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1f8f50
dev-ada/gprbuild: New (2019) version
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
dev-ada/gprbuild/Manifest | 2 +
dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch | 274 ++
dev-ada/gprbuild/gprbuild-2019.ebuild | 90 +++
3 files changed, 366 insertions(+)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 75d4210b6e2..06e3942bc69 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,6 @@
+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 gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B
b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab
SHA512
d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
+DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B
e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8
SHA512
f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B
11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1
SHA512
8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
diff --git a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch
new file mode 100644
index 000..352ff033b81
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2019-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;
++ else
++ Binding_Options_Table.Append (Line (1 ..
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 473ba9da56f59fc0bb59045d51629d14dd0c00b8
Author: Tupone Alfredo gentoo org>
AuthorDate: Fri Nov 30 19:31:00 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Nov 30 19:31:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473ba9da
dev-ada/gprbuild: add -no-pie
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 11 ++-
dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 9 +
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index 1f967b61d4c..34936ea1f52 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -264,12 +264,21 @@
--- a/share/gprconfig/linker.xml 2018-10-17 21:36:15.856883517 +0200
+++ b/share/gprconfig/linker.xml 2018-10-17 21:35:15.985896804 +0200
+@@ -1025,7 +1025,7 @@
+
+
+for Library_Partial_Linker use
+- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
++ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r",
"-no-pie", "-o");
+
+
+
@@ -1044,7 +1044,7 @@
for Library_Partial_Linker use
- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
++ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r",
"-no-pie", "-o");
diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
index 719ce8ae472..a1157f5c370 100644
--- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
@@ -30,9 +30,7 @@ REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_prepare() {
- if use gnat_2016; then
- GCC_PV=4.9.4
- elif use gnat_2017; then
+ if use gnat_2017; then
GCC_PV=6.3.0
else
GCC_PV=7.3.1
@@ -49,10 +47,6 @@ src_prepare() {
-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
src/gprlib.adb \
|| die
-# sed -i \
-# -e "s:\"-Wl,-r\":\"-r\":g" \
-# share/gprconfig/linker.xml \
-# || die
}
src_configure() {
@@ -88,6 +82,5 @@ src_install() {
doins share/gprconfig/*
insinto /usr/share/gpr
doins share/_default.gpr
- insinto /usr/share/gprconfig
einstalldocs
}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 7a7f23ac779030145a23fa786c43f0b0790f5879
Author: Tupone Alfredo gentoo org>
AuthorDate: Wed Nov 7 19:53:26 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Nov 7 19:53:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7f23ac
dev-ada/gprbuild: Stabilize and remove old
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2017.xml | 85
dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 2 +-
dev-ada/gprbuild/gprbuild-2017.ebuild| 81 --
dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 2 +-
4 files changed, 2 insertions(+), 168 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2017.xml
b/dev-ada/gprbuild/files/gprbuild-2017.xml
deleted file mode 100644
index 9e1e47b512e..000
--- a/dev-ada/gprbuild/files/gprbuild-2017.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-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)}");
- 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-2017-r1.ebuild
b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
index 1f443284e87..df5101ac4bf 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
-> xmlada-gpl-${PV}-src.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gnat_2016 +gnat_2017 gnat_2018"
DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild
b/dev-ada/gprbuild/gprbuild-2017.ebuild
deleted file mode 100644
index a8b5614d423..000
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 1340f40143dcafb4f0d64de0fb7b58de01a892f5
Author: Tupone Alfredo gentoo org>
AuthorDate: Fri Oct 19 20:29:47 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Oct 19 20:30:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1340f401
dev-ada/gprbuild: Fix gnatbind path
Closes: https://bugs.gentoo.org/668964
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 10 ++
.../{gprbuild-2018-r2.ebuild => gprbuild-2018-r3.ebuild} | 0
2 files changed, 10 insertions(+)
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index 9f62ec9ff9d..1f967b61d4c 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -241,6 +241,16 @@
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-17 21:31:44.442501471 +0200
+++ b/share/gprconfig/c.xml2018-10-17 21:33:06.562088044 +0200
@@ -14,7 +14,7 @@
diff --git a/dev-ada/gprbuild/gprbuild-2018-r2.ebuild
b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
similarity index 100%
rename from dev-ada/gprbuild/gprbuild-2018-r2.ebuild
rename to dev-ada/gprbuild/gprbuild-2018-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: e4b0680c19c1deb6a5063740ee1082b85e2497d9
Author: Tupone Alfredo gentoo org>
AuthorDate: Wed Oct 17 19:54:02 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Oct 17 19:54:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b0680c
dev-ada/gprbuild: bump to 2018-r2 trying to fix C builds
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 167 +
dev-ada/gprbuild/files/gprbuild-2018.xml | 93
...uild-2018-r1.ebuild => gprbuild-2018-r2.ebuild} | 18 ++-
3 files changed, 178 insertions(+), 100 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index 35a98ae03fc..9f62ec9ff9d 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -96,3 +96,170 @@
when Copy_Source_Dir =>
Copy_Source_Directory := new String'(Line (1 .. Last));
+--- a/share/gprconfig/compilers.xml2018-10-17 14:36:15.100480516 +0200
b/share/gprconfig/compilers.xml2018-10-17 15:38:57.333256634 +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
+
+
+
+@@ -170,14 +170,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-|.*-qnx.*)?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-|.*-qnx.*)?gnatls-@VER@
+
+- ${PREFIX}gnatls -v --version
++ ${PREFIX}gnatls-@VER@ -v --version
+
+
+ Ada
+
+- ${PREFIX}gcc -v
++ ${PREFIX}gcc-@VER@ -v
+
+
+
+@@ -187,71 +187,11 @@
+\.\./$TARGET/lib/gnat/(.*)/adalib/
+
+
+- ${PREFIX}gcc -dumpmachine
++ ${PREFIX}gcc-@VER@ -dumpmachine
+
+
+
+
+-
+-
+-
+-GNAT_CODEPEER
+-(.*codepeer-)gnatls
+-
+- ${PREFIX}gnatls -v
+-
+-
+-Ada
+-
+- ${PREFIX}gcc -v
+-
+-
+-
+- \.\./lib/gcc/.*/$gcc_version/adalib/
+- \.\./lib/gnat/(.*)/adalib/
+- \.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/
+-
+-codepeer
+-
+-
+-
+-
+-
+-GNAT_C
+-(c-)gnatls
+-
+- ${PREFIX}gnatls -v
+-
+-
+-Ada
+-
+- ${PREFIX}gcc -v
+-
+-
+-
+- \.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/
+- \.\./lib/gnat/(.*)/adalib/
+-
+-c
+-
+-
+-
+-
+-
+-GNAT_DOTNET
+-(.*dotnet-)gnatls
+-
+- ${PREFIX}gnatls -v
+-
+-
+-Ada
+-
+- \.\./lib/dotgnat/adalib/
+- \.\./lib/dotgnat/rts-(.*)/adalib/
+-
+-dotnet
+-
+-
+
+
+ G77
+@@ -295,21 +295,6 @@
+
+
+
+-
+-
+-LLVM
+-clang
+-
+- clang -v
+-
+-
+-C
+-
+- clang -dumpmachine
+-
+-
+-
+-
+
+
+ WINDRES
+--- a/share/gprconfig/gnat.xml 2018-10-17 18:38:35.547094541 +0200
b/share/gprconfig/gnat.xml 2018-10-17 18:40:16.281379341 +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
+--- a/share/gprconfig/c.xml2018-10-17 21:31:44.442501471 +0200
b/share/gprconfig/c.xml2018-10-17 21:33:06.562088044 +0200
+@@ -14,7 +14,7 @@
+
+
+package Compiler is
+- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
++ for Driver ("C") use
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 9670f34afab1041f619dec6fee99865f9a0cfe1b
Author: Tupone Alfredo gentoo org>
AuthorDate: Fri Oct 12 07:01:13 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Oct 12 07:01:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9670f34a
dev-ada/gprbuild: Remove duplicate file
Signed-off-by: Alfredo Tupone gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2018.xml | 85
dev-ada/gprbuild/gprbuild-2018.ebuild| 4 +-
2 files changed, 2 insertions(+), 87 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml
b/dev-ada/gprbuild/files/gprbuild-2018.xml
deleted file mode 100644
index 9e1e47b512e..000
--- a/dev-ada/gprbuild/files/gprbuild-2018.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-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)}");
- 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.ebuild
b/dev-ada/gprbuild/gprbuild-2018.ebuild
index 95d0bdafd85..3d3b6f41c7d 100644
--- a/dev-ada/gprbuild/gprbuild-2018.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018.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
@@ -37,7 +37,7 @@ src_prepare() {
else
GCC_PV=7.3.1
fi
- sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
+ sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${PN}-2017.xml >
gnat-${GCC_PV}.xml
default
sed -i \
-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 3d9e0024cf577d70fcc7b8780460cc005d7b417a
Author: Tupone Alfredo gentoo org>
AuthorDate: Sat Jun 9 19:07:34 2018 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jun 9 19:08:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d9e0024
dev-ada/gprbuild: Version bump to dev-ada/gprbuild-2018
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-ada/gprbuild/Manifest | 2 +
dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 81 +
dev-ada/gprbuild/files/gprbuild-2018.xml | 85 +++
dev-ada/gprbuild/gprbuild-2018.ebuild | 84 ++
dev-ada/gprbuild/metadata.xml | 1 +
5 files changed, 253 insertions(+)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 215384713a4..75d4210b6e2 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,2 +1,4 @@
DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
+DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B
b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab
SHA512
d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
+DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B
11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1
SHA512
8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
new file mode 100644
index 000..c5225d8d11f
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -0,0 +1,81 @@
+--- 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-2017-src/gpr/src/gpr-names.ads.old2017-11-19
13:09:18.947527738 +0100
gprbuild-gpl-2017-src/gpr/src/gpr-names.ads2017-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.old2017-11-19
13:10:27.674316703 +0100
gprbuild-gpl-2017-src/gpr/src/gpr-names.adb2017-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");
+--- gprbuild-gpl-2017/src/gprlib.adb.old 2017-12-18 12:20:02.937317216
+0100
gprbuild-gpl-2017/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100
+@@ -263,7 +263,7 @@
+
+Driver_Name : Name_Id := No_Name;
+
+- Gnatbind_Name : String_Access := new String'("gnatbind");
++ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
+
+Compiler_Name : String_Access := new String'("gcc");
+
+@@ -2237,13 +2237,13 @@
+ and then Line (Last - 2 .. Last) = "gcc"
+ then
+Gnatbind_Name :=
+- new String'(Line (1 .. Last -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 107bb1d8798d0a0a1c2d32a6d212f3d92c79c3fc
Author: Tupone Alfredo gentoo org>
AuthorDate: Tue Dec 19 08:00:08 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue Dec 19 08:00:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107bb1d8
dev-ada/gprbuild: use gnatbind versioned and remove old ebuild
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-ada/gprbuild/Manifest | 2 -
dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 271 --
dev-ada/gprbuild/files/gprbuild-2016.xml | 94
dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 27 +++
dev-ada/gprbuild/gprbuild-2016.ebuild | 77 --
dev-ada/gprbuild/gprbuild-2017.ebuild | 4 +
6 files changed, 31 insertions(+), 444 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index f19ce633287..215384713a4 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,2 @@
-DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B
69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14
SHA512
6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B
32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09
SHA512
d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
deleted file mode 100644
index ddf5a0c3309..000
--- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-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 @@
-+
-+--
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: e863600c2ba1b16b5d0a05eb68c6c91a37650c00
Author: Tupone Alfredo gentoo org>
AuthorDate: Sat Jul 1 16:32:46 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jul 1 16:32:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e863600c
dev-ada/gprbuild: rm version
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-ada/gprbuild/files/gprbuild--gentoo.patch | 44 -
dev-ada/gprbuild/gprbuild-.ebuild | 111 --
2 files changed, 155 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild--gentoo.patch
b/dev-ada/gprbuild/files/gprbuild--gentoo.patch
deleted file mode 100644
index bebe795de96..000
--- a/dev-ada/gprbuild/files/gprbuild--gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
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-.ebuild
b/dev-ada/gprbuild/gprbuild-.ebuild
deleted file mode 100644
index 86fb99df1e2..000
--- a/dev-ada/gprbuild/gprbuild-.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3 toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/;
-SRC_URI="
- bootstrap? (
- http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
- -> xmlada-gpl-2016-src.tar.gz )"
-EGIT_REPO_URI="https://github.com/AdaCore/gprbuild.git;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="bootstrap +shared static static-pic"
-
-DEPEND="dev-lang/gnat-gpl:=
- >=dev-python/sphinx-1.5.2
- !bootstrap? ( dev-ada/xmlada[static] )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="bootstrap? ( !shared !static !static-pic )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
- GCC=${ADA:-$(tc-getCC)}
- 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"
- eerror "2) set ADA=gcc-4.9.4 in make.conf"
- die "ada compiler not available"
- fi
-}
-
-src_unpack() {
- git-r3_src_unpack
- default
-}
-src_prepare() {
- sed -i \
- -e "/gnatls/d" \
- Makefile || die
- default
-}
-
-src_configure() {
- make prefix="${D}"usr setup
- default
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
- if use bootstrap; then
- local xmlada_src="../xmlada-gpl-2016-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"
- $(tc-getCC) -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o
- for bin in ${bin_progs}; do
- ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS
${bin}-main \
- -o ${bin} -largs gpr_imports.o
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 6ee3ef271a151c6e2351ffa3ec38d49f1b30cdcf
Author: Tupone Alfredo gentoo org>
AuthorDate: Fri Jun 23 19:39:54 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Jun 23 19:41:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee3ef27
dev-ada/gprbuild: Add compiler description file
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-ada/gprbuild/files/gprbuild-2017.xml | 85
dev-ada/gprbuild/gprbuild-2017.ebuild| 9
2 files changed, 94 insertions(+)
diff --git a/dev-ada/gprbuild/files/gprbuild-2017.xml
b/dev-ada/gprbuild/files/gprbuild-2017.xml
new file mode 100644
index 000..9e1e47b512e
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2017.xml
@@ -0,0 +1,85 @@
+
+
+
+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)}");
+ 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-2017.ebuild
b/dev-ada/gprbuild/gprbuild-2017.ebuild
index 3165385d33c..0f7b634ec96 100644
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild
@@ -49,6 +49,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() {
emake prefix="${D}"usr setup
}
@@ -108,5 +115,7 @@ src_install() {
done
rm "${D}"usr/doinstall || die
fi
+ insinto /usr/share/gprconfig
+ doins gnat-${GCC_PV}.xml
einstalldocs
}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 2d535a0cf60f54e3fd5057aa3d4e4c05df6a6e63
Author: Tupone Alfredo gentoo org>
AuthorDate: Mon Jun 19 20:19:09 2017 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Jun 19 20:19:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d535a0c
dev-ada/gprbuild: Add version 2017
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-ada/gprbuild/Manifest | 2 +
dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 23
dev-ada/gprbuild/gprbuild-2016.ebuild | 2 +-
.../{gprbuild-2016.ebuild => gprbuild-2017.ebuild} | 61 +-
dev-ada/gprbuild/gprbuild-.ebuild | 4 +-
5 files changed, 65 insertions(+), 27 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 1642070972e..dab1b96f734 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,2 +1,4 @@
DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256
d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512
6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
WHIRLPOOL
2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945
+DIST gprbuild-gpl-2017-src.tar.gz 2454957 SHA256
0d0a48b8744e4f7230a85008d8213b583459046395704e8ab8c5cabedbf7c616 SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
WHIRLPOOL
905b3a6d64a7f8a6970586b5d1c010badcc24c42e4b406ed7508e0470920b86d0992e80dc2326b10a314cb27519944f5199a7f0d75e72dae8fb096180c22a781
DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256
ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512
d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
WHIRLPOOL
b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7
+DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256
9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
WHIRLPOOL
4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
new file mode 100644
index 000..70491e177a7
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
@@ -0,0 +1,23 @@
+--- 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-17.0/src/gprbuild-post_compile.adb.old2017-05-18
14:17:06.114797015 +0200
gprbuild-17.0/src/gprbuild-post_compile.adb2017-05-18
14:18:55.466956852 +0200
+@@ -4744,7 +4744,9 @@
+ No_Create => Proj.Is_Aggregated);
+end if;
+
+- Shared_Libs := not Is_Static (Proj.Proj);
++ if not Is_Static (Proj.Proj) then
++ Shared_Libs := True;
++ end if;
+
+ end if;
+ end if;
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild
b/dev-ada/gprbuild/gprbuild-2016.ebuild
index b021ddc6047..a3691ac46ff 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="bootstrap +shared static static-pic"
-DEPEND="dev-lang/gnat-gpl
+DEPEND="dev-lang/gnat-gpl:=
!bootstrap? ( dev-ada/xmlada )"
RDEPEND="${DEPEND}"
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild
b/dev-ada/gprbuild/gprbuild-2017.ebuild
similarity index 53%
copy from dev-ada/gprbuild/gprbuild-2016.ebuild
copy to dev-ada/gprbuild/gprbuild-2017.ebuild
index b021ddc6047..3165385d33c 100644
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild
@@ -10,19 +10,18 @@ MYP=${PN}-gpl-${PV}
DESCRIPTION="Multi-Language Management"
HOMEPAGE="http://libre.adacore.com/;
SRC_URI="
- http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
+ http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
-> ${MYP}-src.tar.gz
bootstrap? (
- http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0
+ http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
