diff options
| -rw-r--r-- | dev-ada/gprbuild/Manifest | 2 | ||||
| -rw-r--r-- | dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch | 274 | ||||
| -rw-r--r-- | dev-ada/gprbuild/gprbuild-2020-r1.ebuild (renamed from dev-ada/gprbuild/gprbuild-2019-r1.ebuild) | 18 |
3 files changed, 9 insertions, 285 deletions
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index f7e381e3e4eb..3ee032d60e95 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-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 -DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch deleted file mode 100644 index 352ff033b81b..000000000000 --- a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch +++ /dev/null @@ -1,274 +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 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-|.*-pc-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-|.*-pc-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> -@@ -170,14 +170,14 @@ - --> - <compiler_description> - <name>GNAT</name> -- <executable prefix="1">(.*-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</executable> -+ <executable prefix="1">(.*-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@</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"> -@@ -187,67 +187,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> -- </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> -@@ -262,45 +206,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> -- -- <!-- 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> -- - <!-- G77 --> - <compiler_description> - <name>G77</name> -@@ -404,21 +309,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 -@@ -1015,7 +1015,7 @@ - </targets> - <config> - 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"); - </config> - </configuration> - -@@ -1034,7 +1034,7 @@ - </targets> - <config> - for Library_Partial_Linker use -- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); - </config> - </configuration> - diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild index edba878042c2..d95789381b9f 100644 --- a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -ADA_COMPAT=( gnat_201{7,8,9} ) +ADA_COMPAT=( gnat_201{7..9} gnat_2020 ) inherit ada toolchain-funcs multiprocessing -MYP=${P}-20190517-194D8-src -XMLADA=xmlada-${PV}-20190429-19B9D-src +MYP=${P}-20200429-19BD2-src +XMLADA=xmlada-${PV}-20200429-19A99-src DESCRIPTION="Multi-Language Management" HOMEPAGE="http://libre.adacore.com/" SRC_URI=" - http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 + https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz -> ${MYP}.tar.gz - http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 + https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="${ADA_DEPS}" @@ -60,11 +60,11 @@ src_compile() { 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 gpr_imports.o || die + -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die done for lib in $lib_progs; do gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ - -largs gpr_imports.o || die + -largs ${LDFLAGS} gpr_imports.o || die done } |