commit: edbcf396d0d83b65977186af2a5c530e2b5df30a
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 20:25:31 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 20:26:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbcf396
dev-ada/gprbuild: separate gprconfig_kb
Signed-off-by: Alfredo Tupone <tupone <AT> 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..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/gpr/src/gpr_imports.c 2022-02-27 10:10:34.053638209 +0100
-+++ b/gpr/src/gpr_imports.c 2022-02-27 10:12:03.898276758 +0100
-@@ -114,6 +114,44 @@
- const char *__gnat_default_libgcc_subdir = "lib";
- #endif
-
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <limits.h>
-+#include <unistd.h>
-+
-+ extern long long __gnat_file_time(char* name)
-+ {
-+ long long result;
-+
-+ if (name == NULL) {
-+ return LLONG_MIN;
-+ }
-+ /* Number of seconds between <Jan 1st 1970> and <Jan 1st 2150>. */
-+ static const long long ada_epoch_offset = (136 * 365 + 44 * 366) *
86400LL;
-+ struct stat sb;
-+ if (stat(name, &sb) != 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,
&result)) {
-+ return LLONG_MIN;
-+ }
-+
-+ if (__builtin_smulll_overflow(result, 1E9, &result)) {
-+ return LLONG_MIN;
-+ }
-+
-+ if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, &result)) {
-+ 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.xml 2019-06-01 21:29:57.611722804 +0200
-+++ b/share/gprconfig/compilers.xml 2019-06-01 21:42:56.000608601 +0200
-@@ -20,15 +20,15 @@
- <!-- GCC 3.x & 4.x (not for GNAT Pro)-->
- <compiler_description>
- <name>GCC</name>
-- <executable
prefix="1">(.*-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</executable>
-+ <executable
prefix="1">(.*-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-@VER@</executable>
- <version>
-- <external>${PREFIX}gcc -v</external>
-+ <external>${PREFIX}gcc-@VER@ -v</external>
- <nogrep regexp="for GNAT Pro"></nogrep>
- <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
- </version>
- <languages>C</languages>
- <target>
-- <external>${PREFIX}gcc -dumpmachine</external>
-+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
- <grep regexp="[^\r\n]+"></grep>
- </target>
- </compiler_description>
-@@ -185,14 +185,14 @@
- -->
- <compiler_description>
- <name>GNAT</name>
-- <executable
prefix="1">(.*-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-|.*-qnx.*|.*-rtems.*)?gnatls</executable>
-+ <executable
prefix="1">(.*-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-|.*-qnx.*|.*-rtems.*)?gnatls-@VER@</executable>
- <version>
-- <external>${PREFIX}gnatls -v --version</external>
-+ <external>${PREFIX}gnatls-@VER@ -v --version</external>
- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
- </version>
- <languages>Ada</languages>
- <variable name="gcc_version">
-- <external>${PREFIX}gcc -v</external>
-+ <external>${PREFIX}gcc-@VER@ -v</external>
- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
- </variable>
- <runtimes default="default,kernel,native">
-@@ -202,68 +202,11 @@
- <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
- </runtimes>
- <target>
-- <external>${PREFIX}gcc -dumpmachine</external>
-+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
- <grep regexp="[^\r\n]+"></grep>
- </target>
- </compiler_description>
-
-- <!-- CodePeer -->
--
-- <compiler_description>
-- <name>GNAT_CODEPEER</name>
-- <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
-- <version>
-- <external>${PREFIX}gnatls -v</external>
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-- </version>
-- <languages>Ada,C,C++</languages>
-- <variable name="gcc_version">
-- <external>${PREFIX}gcc -v</external>
-- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-- </variable>
-- <runtimes default="default,native">
-- <directory group="default"
>\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
-- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
-- <directory group="1"
>\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
-- </runtimes>
-- <target>codepeer</target>
-- </compiler_description>
--
-- <!-- Generic GNAT LLVM Target -->
--
-- <compiler_description>
-- <name>GNAT_LLVM</name>
-- <executable prefix="1">(llvm-)gnatls</executable>
-- <version>
-- <external>${PREFIX}gnatls -v</external>
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-- </version>
-- <languages>Ada</languages>
-- <variable name="gcc_version">
-- <external>${PREFIX}gcc -v</external>
-- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-- </variable>
-- <runtimes default="default,native">
-- <directory group="default" >\.\./lib/rts-native/adalib/</directory>
-- <directory group="1" >\.\./lib/rts-(.*)/adalib/</directory>
-- </runtimes>
-- <target>llvm</target>
-- </compiler_description>
--
-- <!-- Generic C compiler for LLVM -->
-- <compiler_description>
-- <name>C_LLVM</name>
-- <executable>clang</executable>
-- <version>
-- <external>clang --version</external>
--
-- <!-- '...clang version 6.0.0...' -->
-- <grep regexp="clang version (\S+)" group="1"></grep>
-- </version>
-- <languages>C</languages>
-- <target>llvm</target>
-- </compiler_description>
--
- <!-- Generic C++ compiler for LLVM -->
- <compiler_description>
- <name>C++_LLVM</name>
-@@ -221,28 +221,6 @@
- <target>llvm</target>
- </compiler_description>
-
-- <!-- C Target -->
--
-- <compiler_description>
-- <name>GNAT_C</name>
-- <executable prefix="1">(c-)gnatls</executable>
-- <version>
-- <external>${PREFIX}gnatls -v</external>
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-- </version>
-- <languages>Ada</languages>
-- <variable name="gcc_version">
-- <external>${PREFIX}gcc -v</external>
-- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-- </variable>
-- <runtimes default="default,ccg">
-- <directory group="default"
>\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
-- <directory group="1"
>\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
-- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
-- </runtimes>
-- <target>c</target>
-- </compiler_description>
--
- <!-- CCG Target (C generation via LLVM) -->
-
- <compiler_description>
-@@ -286,23 +264,6 @@
- </compiler_description>
-
-
-- <!-- GNAT_DOTNET -->
--
-- <compiler_description>
-- <name>GNAT_DOTNET</name>
-- <executable prefix="1">(.*dotnet-)gnatls</executable>
-- <version>
-- <external>${PREFIX}gnatls -v</external>
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-- </version>
-- <languages>Ada</languages>
-- <runtimes default="default,kernel">
-- <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
-- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
-- </runtimes>
-- <target>dotnet</target>
-- </compiler_description>
--
- <!-- JGNAT -->
-
- <compiler_description>
-@@ -421,21 +326,6 @@
- </target>
- </compiler_description>
-
-- <!-- LLVM Compiler -->
-- <compiler_description>
-- <name>LLVM</name>
-- <executable>clang</executable>
-- <version>
-- <external>clang -v</external>
-- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
-- </version>
-- <languages>C,C++</languages>
-- <target>
-- <external>clang -dumpmachine</external>
-- <grep regexp="[^\r\n]+"></grep>
-- </target>
-- </compiler_description>
--
- <!-- Windres compiler -->
- <compiler_description>
- <name>WINDRES</name>
---- a/share/gprconfig/gnat.xml 2019-06-01 21:53:53.383281607 +0200
-+++ b/share/gprconfig/gnat.xml 2019-06-01 21:57:08.414196529 +0200
-@@ -60,7 +60,7 @@
- &filter_gnat;
- <config>
- 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.xml 2019-06-01 21:57:36.244755708 +0200
-+++ b/share/gprconfig/c.xml 2019-06-01 21:59:14.919191663 +0200
-@@ -14,7 +14,7 @@
- </compilers>
- <config>
- package Compiler is
-- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
-+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
- end Compiler;
- </config>
- </configuration>
---- a/share/gprconfig/linker.xml 2019-06-01 21:59:34.546880368 +0200
-+++ b/share/gprconfig/linker.xml 2019-06-01 22:00:50.906668730 +0200
-@@ -112,6 +112,9 @@
- for Object_Lister use ("nm", "-g");
- for Object_Lister_Matcher use " [TDRB] (.*)";
-
-+ LDFLAGS := External_As_List ("LDFLAGS", " ");
-+ for Leading_Library_Options use LDFLAGS;
-+
- package Linker is
- for Export_File_Format use "GNU";
- for Export_File_Switch use "-Wl,--version-script=";
-@@ -1211,7 +1211,7 @@
- </targets>
- <config>
- for Library_Partial_Linker use
-- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib")
-+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib")
- & GCC_No_Pie
- & ("-Wl,-r", "-o");
- </config>
-@@ -1232,7 +1232,7 @@
- </targets>
- <config>
- for Library_Partial_Linker use
-- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib")
-+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib")
- & GCC_No_Pie
- & ("-Wl,-r", "-o");
- </config>
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
b/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild
similarity index 59%
rename from dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
rename to dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild
index d221c018a4fe..9c520cc6d4a1 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild
@@ -3,12 +3,11 @@
EAPI=7
-ADA_COMPAT=( gnat_202{0,1} gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
inherit ada multiprocessing
XMLADA=xmlada-${PV}
-GPRCONFIG_KB=gprconfig_kb-${PV}
DESCRIPTION="Multi-Language Management"
HOMEPAGE="http://libre.adacore.com/";
@@ -16,57 +15,28 @@ 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"
+ -> ${XMLADA}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="${ADA_DEPS}"
+DEPEND="${ADA_DEPS}
+ dev-ada/gprconfig_kb[${ADA_USEDEP}]"
RDEPEND="${DEPEND}"
REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-nm.patch
- "${FILESDIR}"/${P}-ar.patch
"${FILESDIR}"/${PN}-2021-runpath.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" \
- -e "s:\$gcc_version:${GCC_PV}:g" \
- share/gprconfig/compilers.xml \
- share/gprconfig/gnat.xml \
- share/gprconfig/c.xml \
- share/gprconfig/linker.xml \
- || die
sed -i \
-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"
@@ -92,9 +62,6 @@ src_install() {
dobin ${bin_progs}
exeinto /usr/libexec/gprbuild
doexe ${lib_progs}
- insinto /usr/share/gprconfig
- doins share/gprconfig/*.xml
- doins share/gprconfig/*.ent
insinto /usr/share/gpr
doins share/_default.gpr
einstalldocs
