* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprconfig_kb/files/, dev-ada/gprconfig_kb/
@ 2022-12-03 21:51 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2022-12-03 21:51 UTC (permalink / raw
To: gentoo-commits
commit: c6abb6c94e47ed3fb4f250160f5bf82e3a42b00f
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 21:38:10 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 21:50:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6abb6c9
dev-ada/gprconfig_kb: fix ada RUNTIME_DIR
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch | 7 ++++++-
.../{gprconfig_kb-23.0.0.ebuild => gprconfig_kb-23.0.0-r1.ebuild} | 0
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch
index 0cbd7579a447..6808542199fa 100644
--- a/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch
+++ b/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch
@@ -9,7 +9,7 @@
<version>
<external>$EXEC -v</external>
<nogrep regexp="for GNAT Pro"></nogrep>
-@@ -173,14 +173,14 @@
+@@ -173,18 +173,18 @@
-->
<compiler_description>
<name>GNAT</name>
@@ -27,6 +27,11 @@
<grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
</variable>
<variable name="gcc_version_major">
+- <external>${PREFIX}gcc -v</external>
++ <external>${PREFIX}gcc-@VER@ -v</external>
+ <grep regexp="^[-\w]*gcc \S+ (\d+)\.\d+\.\d+" group="1"></grep>
+ </variable>
+ <runtimes default="default,kernel,native">
@@ -194,7 +194,7 @@
<directory group="2" >\.\./$TARGET/lib(32|64)?/gnat/(.*)/adalib/</directory>
</runtimes>
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r1.ebuild
similarity index 100%
rename from dev-ada/gprconfig_kb/gprconfig_kb-23.0.0.ebuild
rename to dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r1.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprconfig_kb/files/, dev-ada/gprconfig_kb/
@ 2024-12-27 21:08 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2024-12-27 21:08 UTC (permalink / raw
To: gentoo-commits
commit: c7b5ffd4166fc325f2446f0f39d0d3de90fecdf3
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 21:07:42 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 21:08:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b5ffd4
dev-ada/gprconfig_kb: add 25.0.0
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gprconfig_kb/Manifest | 1 +
.../files/gprconfig_kb-25.0.0-gentoo.patch | 129 +++++++++++++++++++++
dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild | 38 ++++++
3 files changed, 168 insertions(+)
diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest
index c4c4cd29d437..a43f6babeb46 100644
--- a/dev-ada/gprconfig_kb/Manifest
+++ b/dev-ada/gprconfig_kb/Manifest
@@ -1,2 +1,3 @@
DIST gprconfig_kb-23.0.0.tar.gz 42132 BLAKE2B ed39c8f199e0cd31dbd3b587bcf589d62befc29ab907c54d9bcbc08887239a5ce12bc22428631e32d8c69c0c6bdd01e4591d050f480ea461f4d8af0f1cc05288 SHA512 505b632ff744c8fbb75b72d0f406a88a2c675d5afead9f0f8ca282ae79ca4e38c174dfe424c4c4a55835a9ebdbc6d0a2f329592bd6dfb87d5493e8473a0b2376
DIST gprconfig_kb-24.0.0.tar.gz 43010 BLAKE2B af246be2c5683655bf023e07b08539647d8a351f8f5d8eace77665980fca80855262028667a94b5d9ed9ebf2af16d061968822ef923505c7a4de6497baefa3d7 SHA512 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
+DIST gprconfig_kb-25.0.0.tar.gz 44165 BLAKE2B e026f7f644dfd8ba4665fd22ef6cb5abcdb1013779a8119e1be3dc3313cca37af138e1a351f2fc8dd10780009d0d98e0ab60e73293ea508acbe4cd5a836bdb16 SHA512 afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
new file mode 100644
index 000000000000..be64afb433ef
--- /dev/null
+++ b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
@@ -0,0 +1,129 @@
+--- a/db/compilers.xml 2019-06-01 21:29:57.611722804 +0200
++++ b/db/compilers.xml 2019-06-01 21:42:56.000608601 +0200
+@@ -20,7 +20,7 @@
+ <!-- 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.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-freebsd.*)?gcc(-\d+)?</executable>
++ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-freebsd.*)?gcc-@VER@</executable>
+ <version>
+ <external>$EXEC -v</external>
+ <nogrep regexp="for GNAT Pro"></nogrep>
+@@ -189,18 +189,18 @@
+ -->
+ <compiler_description>
+ <name>GNAT</name>
+- <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gnatls</executable>
++ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gnatls-@VER@</executable>
+ <version>
+- <external>${PREFIX}gnatls -v --version</external>
++ <external>${EXEC} -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>
+ <variable name="gcc_version_major">
+- <external>${PREFIX}gcc -v</external>
++ <external>${PREFIX}gcc-@VER@ -v</external>
+ <grep regexp="^[-\w]*gcc \S+ (\d+)\.\d+\.\d+" group="1"></grep>
+ </variable>
+ <runtimes default="default,kernel,native">
+@@ -210,7 +210,7 @@
+ <directory group="2" >\.\./$TARGET/lib(32|64)?/gnat/(.*)/adalib/</directory>
+ </runtimes>
+ <target>
+- <external>${PREFIX}gcc -dumpmachine</external>
++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+ <grep regexp="[^\r\n]+"></grep>
+ </target>
+ </compiler_description>
+@@ -302,7 +302,7 @@
+ <!-- Generic C compiler for LLVM -->
+ <compiler_description>
+ <name>C_LLVM</name>
+- <executable>clang</executable>
++ <executable>fake-clang</executable>
+ <version>
+ <external>clang --version</external>
+
+--- a/db/gnat.xml 2019-06-01 21:53:53.383281607 +0200
++++ b/db/gnat.xml 2019-06-01 21:57:08.414196529 +0200
+@@ -10,7 +10,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
+@@ -27,6 +27,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=${PREFIX(ada)}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/db/c.xml 2019-06-01 21:57:36.244755708 +0200
++++ b/db/c.xml 2019-06-01 21:59:14.919191663 +0200
+@@ -25,7 +25,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/db/linker.xml 2021-12-21 22:36:01.054738486 +0100
++++ b/db/linker.xml 2021-12-21 22:36:59.973738600 +0100
+@@ -130,9 +130,13 @@
+ <host name="^i686.*-linux.*$" />
+ </hosts>
+ <config>
+- for Object_Lister use ("nm", "-g");
++ NM := External("NM", "nm");
++ 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=";
+@@ -1022,7 +1026,8 @@
+ <host name="^x86_64-.*linux.*" />
+ </hosts>
+ <config>
+- for Archive_Builder use ("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";
+@@ -1395,7 +1400,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>
+@@ -1421,7 +1426,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/gprconfig_kb/gprconfig_kb-25.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
new file mode 100644
index 000000000000..1f327d97a90c
--- /dev/null
+++ b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
+
+inherit ada
+
+DESCRIPTION="GPR configuration knowledge base"
+HOMEPAGE="https://www.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s:@VER@:${GCCPV}:g" \
+ db/compilers.xml \
+ db/gnat.xml \
+ db/c.xml \
+ db/linker.xml \
+ || die
+}
+
+src_install() {
+ insinto /usr/share/gprconfig
+ doins db/*.xml
+ doins db/*.ent
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprconfig_kb/files/, dev-ada/gprconfig_kb/
@ 2025-01-05 8:28 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2025-01-05 8:28 UTC (permalink / raw
To: gentoo-commits
commit: a754b8a583764f345a2c60d42b51589f735971c2
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 22:35:00 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 08:27:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a754b8a5
dev-ada/gprconfig_kb: drop 23.0.0, fix ~arm64:
See:
https://github.com/AdaCore/gprconfig_kb/issues/23
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gprconfig_kb/Manifest | 1 -
.../files/gprconfig_kb-25.0.0-gentoo.patch | 41 ++++++++++++++++++++++
dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild | 39 --------------------
dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild | 4 +--
4 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest
index a43f6babeb46..983450cc1dff 100644
--- a/dev-ada/gprconfig_kb/Manifest
+++ b/dev-ada/gprconfig_kb/Manifest
@@ -1,3 +1,2 @@
-DIST gprconfig_kb-23.0.0.tar.gz 42132 BLAKE2B ed39c8f199e0cd31dbd3b587bcf589d62befc29ab907c54d9bcbc08887239a5ce12bc22428631e32d8c69c0c6bdd01e4591d050f480ea461f4d8af0f1cc05288 SHA512 505b632ff744c8fbb75b72d0f406a88a2c675d5afead9f0f8ca282ae79ca4e38c174dfe424c4c4a55835a9ebdbc6d0a2f329592bd6dfb87d5493e8473a0b2376
DIST gprconfig_kb-24.0.0.tar.gz 43010 BLAKE2B af246be2c5683655bf023e07b08539647d8a351f8f5d8eace77665980fca80855262028667a94b5d9ed9ebf2af16d061968822ef923505c7a4de6497baefa3d7 SHA512 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
DIST gprconfig_kb-25.0.0.tar.gz 44165 BLAKE2B e026f7f644dfd8ba4665fd22ef6cb5abcdb1013779a8119e1be3dc3313cca37af138e1a351f2fc8dd10780009d0d98e0ab60e73293ea508acbe4cd5a836bdb16 SHA512 afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
index be64afb433ef..c65cc6e1eab1 100644
--- a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
+++ b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
@@ -99,6 +99,45 @@
package Linker is
for Export_File_Format use "GNU";
for Export_File_Switch use "-Wl,--version-script=";
+@@ -696,34 +696,19 @@
+ <configuration>
+ <!-- aarch64-linux - native compiler. -->
+ <targets>
+- <target name="^aarch64-linux-gnu$" />
++ <target name="^aarch64(-unknown)-linux-gnu$" />
+ </targets>
+ <hosts>
+- <host name="^aarch64-linux-gnu$" />
++ <host name="^aarch64(-unknown)-linux-gnu$" />
+ </hosts>
+ <config>
+- for Archive_Builder use ("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";
+ </config>
+ </configuration>
+-
+- <configuration>
+- <!-- aarch64-linux - cross compiler. -->
+- <targets>
+- <target name="^aarch64-.*linux-gnu$" />
+- </targets>
+- <hosts negate="true">
+- <host name="^aarch64-linux-gnu$" />
+- </hosts>
+- <config>
+- for Archive_Builder use ("aarch64-linux-gnu-ar", "cr");
+- for Archive_Builder_Append_Option use ("q");
+- for Archive_Indexer use ("aarch64-linux-gnu-ranlib");
+- for Archive_Suffix use ".a";
+- </config>
+- </configuration>
+
+ <configuration>
+ <targets>
@@ -1022,7 +1026,8 @@
<host name="^x86_64-.*linux.*" />
</hosts>
@@ -127,3 +166,5 @@
& GCC_No_Pie
& ("-Wl,-r", "-o");
</config>
+--- db/linker.xml.old 2025-01-04 23:22:02.343268592 +0100
++++ db/linker.xml 2025-01-04 23:24:11.562660779 +0100
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild
deleted file mode 100644
index 5438b3d85e97..000000000000
--- a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 )
-
-inherit ada
-
-DESCRIPTION="GPR configuration knowledge base"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:@VER@:${GCCPV}:g" \
- db/compilers.xml \
- db/gnat.xml \
- db/c.xml \
- db/linker.xml \
- || die
-}
-
-src_install() {
- insinto /usr/share/gprconfig
- doins db/*.xml
- doins db/*.ent
- einstalldocs
-}
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
index 1f327d97a90c..a7e89934ab37 100644
--- a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
+++ b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprconfig_kb/files/, dev-ada/gprconfig_kb/
@ 2025-01-25 22:31 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2025-01-25 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 1e957d1d9d8dc21185e4213ae28eecae9ffa5696
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 22:30:27 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 22:30:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e957d1d
dev-ada/gprconfig_kb: fix nm path on arm64
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../files/gprconfig_kb-25.0.0-gentoo.patch | 39 ++++++++++++++++++++--
...25.0.0.ebuild => gprconfig_kb-25.0.0-r1.ebuild} | 0
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
index c65cc6e1eab1..b0c32043b32b 100644
--- a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
+++ b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
@@ -99,6 +99,43 @@
package Linker is
for Export_File_Format use "GNU";
for Export_File_Switch use "-Wl,--version-script=";
+@@ -166,32 +166,14 @@
+ <configuration>
+ <!-- aarch64-linux - native compiler. -->
+ <targets>
+- <target name="^aarch64-linux-gnu$" />
++ <target name="^aarch64(-unknown)-linux-gnu$" />
+ </targets>
+ <hosts>
+- <host name="^aarch64-linux-gnu$" />
++ <host name="^aarch64(-unknown)-linux-gnu$" />
+ </hosts>
+ <config>
+- for Object_Lister use ("nm", "-g");
+- for Object_Lister_Matcher use " [TDRBSG] (.*)";
+-
+- package Linker is
+- for Export_File_Format use "GNU";
+- for Export_File_Switch use "-Wl,--version-script=";
+- end Linker;
+- </config>
+- </configuration>
+-
+- <configuration>
+- <!-- aarch64-linux - cross compiler. -->
+- <targets>
+- <target name="^aarch64-.*linux-gnu$" />
+- </targets>
+- <hosts negate="true">
+- <host name="^aarch64-linux-gnu$" />
+- </hosts>
+- <config>
+- for Object_Lister use ("aarch64-linux-gnu-nm", "-g");
++ NM := External("NM", "nm");
++ for Object_Lister use (NM, "-g");
+ for Object_Lister_Matcher use " [TDRBSG] (.*)";
+
+ package Linker is
@@ -696,34 +696,19 @@
<configuration>
<!-- aarch64-linux - native compiler. -->
@@ -166,5 +203,3 @@
& GCC_No_Pie
& ("-Wl,-r", "-o");
</config>
---- db/linker.xml.old 2025-01-04 23:22:02.343268592 +0100
-+++ db/linker.xml 2025-01-04 23:24:11.562660779 +0100
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r1.ebuild
similarity index 100%
rename from dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
rename to dev-ada/gprconfig_kb/gprconfig_kb-25.0.0-r1.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-25 22:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-27 21:08 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprconfig_kb/files/, dev-ada/gprconfig_kb/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2025-01-25 22:31 Alfredo Tupone
2025-01-05 8:28 Alfredo Tupone
2022-12-03 21:51 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox