mirrors/gentoo-ebuilds
3
0
Fork 0
mirror of https://anongit.gentoo.org/git/repo/gentoo.git synced 2025-06-09 06:35:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
gentoo-ebuilds/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
Alfredo Tupone 1e957d1d9d
dev-ada/gprconfig_kb: fix nm path on arm64 
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
2025-01-25 23:30:27 +01:00

205 lines
7.8 KiB
Diff
Raw Permalink Blame History

--- 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") &amp; ("--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=";
@@ -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. -->
<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>
<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")
&amp; GCC_No_Pie
&amp; ("-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")
&amp; GCC_No_Pie
&amp; ("-Wl,-r", "-o");
</config>
Reference in a new issue View git blame Copy permalink