From 046c3c0984fd20387a9f86cdd0842fd81e70d94f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Jan 2023 11:54:41 +0000 Subject: gentoo auto-resync : 15:01:2023 - 11:54:40 --- dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 292 ---------------------- dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 12 - 3 files changed, 306 deletions(-) delete mode 100644 dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch delete mode 100644 dev-ada/gprbuild/files/gprbuild-2021-nm.patch (limited to 'dev-ada/gprbuild') diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 36f8b1396907..97c754c87d5a 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,5 +1,3 @@ -AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e -AUX gprbuild-2021-nm.patch 438 BLAKE2B e680ab2e110805de9ebe121c21364c3fb65e871a800a22ac863e5f3f42513929a9d1c5868e598312b72bfd14c76a4f118535f767b5dd7b79e019607a909cfc8e SHA512 7f2a1ee48c005aa20da779c87d2b00b3bdde1357d7e83094090f162441a03f890d6625121b3d9dcba5a0fbb76ca8bc3803f2a21a998a25a2b9bb882413d51011 AUX gprbuild-2021-runpath.patch 303 BLAKE2B c70fc64c1e4d361cb72910dbab2d8a7652f0c054da7f9a707fa81ea049fb8f2e6272b1d87bb1a177ecae821cc4fb0ebff197b4527c494893cc6f9f11f37220c0 SHA512 1fd8058bbb8c37654337528856c5b5f3538f2e893a4b6da844d661bd25695dc33304648da8c6f38df7d66019e0a616ae1b705035cdcfa48750df69925eb91655 AUX gprbuild-22.0.0-ar.patch 468 BLAKE2B 8cf38d8632123623ff369e6bf0d96c9ca37e828e71e8445ac46ccfb1636ae8676146a61934c0db915c5b1235a4b9bdc899502b3c71cabae2dae2b69082c87b4e SHA512 e1d66c86b1eeea36a84114bf4993eceeef64541c207d8e11318d842648eaead40675f90b2d16ddb27a68088d6f6bcf4b803c5f8b8c282e73453f76f9b99eb773 AUX gprbuild-22.0.0-gentoo.patch 2052 BLAKE2B dcab01dcc71bdab78ecf16796c4174401a3d1dd950fb3600b993ed8e3f9606b7bb19e0ef9e30a1e2265a2003154b6ed06de8b1da73bb3279301b21e68a58e7a0 SHA512 6266611075133e580b07044f1fa85a03918254c189d2def36e227996f377b56876085f3e3ff18b443ccb0cc1d67ee69cb478cd90403015ff4d68107870929c0d diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch deleted file mode 100644 index 15264d6828e6..000000000000 --- a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch +++ /dev/null @@ -1,292 +0,0 @@ ---- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 -+++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 -@@ -266,7 +266,9 @@ - - Driver_Name : Name_Id := No_Name; - -- Gnatbind_Name : String_Access := new String'("gnatbind"); -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); -+ -+ Gnatbind_Path_Option : constant String := "--gnatbind_path="; - - Compiler_Name : String_Access := new String'("gcc"); - -@@ -2081,7 +2083,7 @@ - and then Line (Last - 2 .. Last) = "gcc" - then - Gnatbind_Name := -- new String'(Line (1 .. Last - 3) & "gnatbind"); -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); - Objcopy_Name := - new String'(Line (1 .. Last - 3) & "objcopy"); - -@@ -2089,7 +2091,7 @@ - and then Line (Last - 6 .. Last) = "gcc.exe" - then - Gnatbind_Name := -- new String'(Line (1 .. Last - 7) & "gnatbind"); -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); - Objcopy_Name := - new String'(Line (1 .. Last - 7) & "objcopy"); - end if; -@@ -2241,7 +2243,13 @@ - Mapping_File_Name := new String'(Line (1 .. Last)); - - when Binding_Options => -- Binding_Options_Table.Append (Line (1 .. Last)); -+ if Last > Gnatbind_Path_Option'Length -+ and then Line (1 .. Gnatbind_Path_Option'Length) = -+ Gnatbind_Path_Option then -+ null; -+ else -+ Binding_Options_Table.Append (Line (1 .. Last)); -+ end if; - - 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 -- (.*-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 -+ (.*-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@ - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - - C - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - -@@ -185,14 +185,14 @@ - --> - - GNAT -- (.*-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.*)?gnatls -+ (.*-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.*)?gnatls-@VER@ - -- ${PREFIX}gnatls -v --version -+ ${PREFIX}gnatls-@VER@ -v --version - - - Ada - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - -@@ -202,68 +202,11 @@ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - - -- -- -- -- GNAT_CODEPEER -- (.*gnsa-|.*codepeer-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada,C,C++ -- -- ${PREFIX}gcc -v -- -- -- -- \.\./lib/gcc/.*/$gcc_version/adalib/ -- \.\./lib/gnat/(.*)/adalib/ -- \.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/ -- -- codepeer -- -- -- -- -- -- GNAT_LLVM -- (llvm-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- ${PREFIX}gcc -v -- -- -- -- \.\./lib/rts-native/adalib/ -- \.\./lib/rts-(.*)/adalib/ -- -- llvm -- -- -- -- -- C_LLVM -- clang -- -- clang --version -- -- -- -- -- C -- llvm -- -- - - - C++_LLVM -@@ -221,28 +221,6 @@ - llvm - - -- -- -- -- GNAT_C -- (c-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- ${PREFIX}gcc -v -- -- -- -- \.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/ -- \.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/ -- \.\./lib/gnat/(.*)/adalib/ -- -- c -- -- - - - -@@ -286,23 +264,6 @@ - - - -- -- -- -- GNAT_DOTNET -- (.*dotnet-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- \.\./lib/dotgnat/adalib/ -- \.\./lib/dotgnat/rts-(.*)/adalib/ -- -- dotnet -- -- - - - -@@ -421,21 +326,6 @@ - - - -- -- -- LLVM -- clang -- -- clang -v -- -- -- C,C++ -- -- clang -dumpmachine -- -- -- -- - - - WINDRES ---- 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; - - 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 @@ - - - package Compiler is -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; - end Compiler; - - ---- a/share/gprconfig/linker.xml 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 @@ - - - for Library_Partial_Linker use -- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib") -+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib") - & GCC_No_Pie - & ("-Wl,-r", "-o"); - -@@ -1232,7 +1232,7 @@ - - - for Library_Partial_Linker use -- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib") -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib") - & GCC_No_Pie - & ("-Wl,-r", "-o"); - diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch deleted file mode 100644 index 9fcab1565857..000000000000 --- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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,8 @@ - - - -- 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", " "); -- cgit v1.2.3