commit:     dbb08ba67ee56006c5584bded7b43f16e9c5f6aa
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue May 11 17:06:09 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue May 11 17:06:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb08ba6

dev-lang/gnat-gpl: version bump to 2020

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-lang/gnat-gpl/Manifest                         |   4 +
 dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch |  41 ++++++
 dev-lang/gnat-gpl/gnat-gpl-2020.ebuild             | 140 +++++++++++++++++++++
 dev-lang/gnat-gpl/metadata.xml                     |   2 +
 4 files changed, 187 insertions(+)

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 13cdef5417f..84616d9f3bc 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -11,11 +11,15 @@ DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 
2f79137e176bff04c4fb17ab86330294
 DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 
3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8
 SHA512 
4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
 DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 
8dc1983317517e9d7221ffd3d1c804367c98a7142b3964e6382ee037da2cfebc9e044640549c77905646727e97ba108445b00f36916a65c326e862230608a7dc
 SHA512 
50933d7eab927a2d118e01c5cb85336203544f6fbc3f245a148e952320d6f8452fcd5d355019a144e8af03357d129bb145397506db0a62fddf1f746b6671e7fc
 DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 
449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf
 SHA512 
0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5
+DIST gcc-9-2020-20200429-19AA7-src.tar.gz 101030094 BLAKE2B 
843d7a92f206a08aa6c0fb41b8b93db494eee26c15872b8d8547685c1013559856cd83c5a4139d8ba68aa6737c0270502fd5547664b458cb8fd023f5ce9601e8
 SHA512 
2eaf999f4ef7f0216b7bab9963ce1cb9dd4be4d4645415183a0e0706ce0f0f119a5437c482d60db16ea152ebcb36186fc7900ec196fc7b8022d4d9cea2e5a631
+DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B 
b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389
 SHA512 
54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 
8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf
 SHA512 
507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 
934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8
 SHA512 
5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
 DIST gcc-interface-7-gpl-2018-src.tar.gz 339461 BLAKE2B 
e6009c0b287b1cd8f055226e6919c12f2ba08f8ef24101608691b05b70a7fb0ca708e2ecd126499fb84a126436d3841f1a13be0b6d3442ef3bd3871391f8e1d5
 SHA512 
9dc942a39dd983778756be2951b4c66ac3835bf456dc389f80ffbafdacde4ebcb80720ac9eca8fef8734d6d052c061db37c88dba642d85add10940164d120381
 DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 BLAKE2B 
d08867737fd5a2e8aa87e61efff47757b587baff67810eb9193fe72b68578bcb130f0c1491599588d130663d908b9c6c9a604b1352aeccb79e9dd3bfef4b9f61
 SHA512 
c4a048725517e674cc43b7b72e3b1bdb4f1cf9d81fe3b84dd177a2fda8c7af11c3135e883072b640c8aa351625f49573727c859064683e8b5f096fdbd3990c38
+DIST gcc-interface-9-2020-20200429-19B10-src.tar.gz 351113 BLAKE2B 
a786532194a5ac57dd91b5c207aaf4543e99a3305dccf175908bee80cc96d112b9c5531497516ad1edc33e9bcff62374dd473aed93bfb1d0aea13e017473d98e
 SHA512 
445744a745eee5e3a686ec59f7880a3792d4fd30425a38090e40e5cc85379e6f877745d7ea61ffabb42ed177ee90f01e2309dfdd5f060027cfc86ac77fddebba
 DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B 
ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b
 SHA512 
4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
+DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 
79683138873b236d832939602f084058723a908e1b709b4bab72e7ae5404336d0ad7b8417eca80e1e1e3a1c260d953ac8326da41429c95729129f88caa2dd3e7
 SHA512 
bf93a7b877b44422513a4658b29ddd9edcc320d8ac73d3044f4ce868f10be368993e915e710ed45be287e07e9d6c117e51fa73027ed311b04458c9cae1984253
 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 
2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc
 SHA512 
ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B 
c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7
 SHA512 
5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 
3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88
 SHA512 
4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8

diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch 
b/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch
new file mode 100644
index 00000000000..878b4f82cf5
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch
@@ -0,0 +1,41 @@
+--- a/gcc-9-2020-20200429-19AA7-src/gcc/ada/osint.adb  2017-03-10 
21:58:02.600710156 +0100
++++ b/gcc-9-2020-20200429-19AA7-src/gcc/ada/osint.adb  2017-03-10 
21:59:38.033983293 +0100
+@@ -2229,14 +2229,11 @@
+       for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
+          if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
+             End_Of_Prefix := J - 1;
++            Start_Of_Suffix := J + Prog'Length;
+             exit;
+          end if;
+       end loop;
+ 
+-      if End_Of_Prefix > 1 then
+-         Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
+-      end if;
+-
+       --  Create the new program name
+ 
+       return new String'
+--- a/patch/04_all_nossp-on-nostdlib.patch     2021-05-10 21:37:05.733985417 
+0200
++++ b/patch/04_all_nossp-on-nostdlib.patch     2021-05-10 21:38:02.925029050 
+0200
+@@ -4,7 +4,7 @@
+ --- a/gcc/gcc.c       2017-07-04 09:15:57.740793000 +0200
+ +++ b/gcc/gcc.c       2018-03-02 13:58:44.387741114 +0100
+ @@ -857,6 +857,12 @@ proper position among the other output f
+- #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
++ #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
+  #endif
+  
+ +#ifdef ENABLE_DEFAULT_SSP
+@@ -19,9 +19,9 @@
+ @@ -1131,7 +1148,7 @@ static const char *cc1_options =
+   %{-version:--version}\
+   %{-help=*:--help=%*}\
+-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
++  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
+ - %{fsyntax-only:-o %j} %{-param*}\
+ + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
+   %{coverage:-fprofile-arcs -ftest-coverage}\
++  %{fdump-scos:-fpreserve-decisions-generic}\
+   %{fprofile-arcs|fprofile-generate*|coverage:\
+-    %{!fprofile-update=singel:\

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild 
b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
new file mode 100644
index 00000000000..1e59a7091c9
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_GCC_VER=9.3.0
+PATCH_VER="4"
+
+TOOLCHAIN_GCC_PV=9.3.1
+
+REL=9
+MYP=gcc-${REL}-${PV}-20200429-19AA7-src
+GNATDIR=gnat-${PV}-20200429-19B04-src
+INTFDIR=gcc-interface-${REL}-${PV}-20200429-19B10-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
+
+# we provide own tarball below
+GCC_TARBALL_SRC_URI="
+       
https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=${GNATDIR}.tar.gz
+               -> ${GNATDIR}.tar.gz
+       
https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=${MYP}.tar.gz
+               -> ${MYP}.tar.gz
+       
https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=${INTFDIR}.tar.gz
+               -> ${INTFDIR}.tar.gz
+       bootstrap? (
+               amd64? (
+                       
http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+                       ${BTSTRP_AMD64}.tar.gz
+               )
+               x86? (
+                       
http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+                       ${BTSTRP_X86}.tar.gz
+               )
+       )"
+
+inherit toolchain-funcs toolchain
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/";
+
+LICENSE+=" GPL-2 GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ada +bootstrap"
+RESTRICT="test"
+
+RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
+DEPEND="${RDEPEND}
+       elibc_glibc? ( >=sys-libs/glibc-2.13 )
+       >=sys-devel/binutils-2.20"
+
+S="${WORKDIR}"/${MYP}
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+
+pkg_setup() {
+       toolchain_pkg_setup
+
+       if use amd64; then
+               BTSTRP=${BTSTRP_AMD64}
+       else
+               BTSTRP=${BTSTRP_X86}
+       fi
+
+       if use bootstrap; then
+               GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
+       else
+               GCC=${ADA:-$(tc-getCC)}
+       fi
+
+       gnatbase=$(basename ${GCC})
+       gnatpath=$(dirname ${GCC})
+
+       GNATMAKE=${gnatbase/gcc/gnatmake}
+       if [[ ${gnatpath} != "." ]] ; then
+               GNATMAKE="${gnatpath}/${GNATMAKE}"
+       fi
+}
+
+src_unpack() {
+       if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+               eerror "You need a gcc compiler that provides the Ada Compiler:"
+               eerror "1) use gcc-config to select the right compiler or"
+               eerror "2) set the bootstrap use flag"
+               die "ada compiler not available"
+       fi
+
+       toolchain_src_unpack
+       if use bootstrap; then
+               rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+       fi
+}
+
+src_prepare() {
+       CC=${GCC}
+       CXX="${gnatbase/gcc/g++}"
+       GNATBIND="${gnatbase/gcc/gnatbind}"
+       GNATLINK="${gnatbase/gcc/gnatlink}"
+       GNATLS="${gnatbase/gcc/gnatls}"
+       if [[ ${gnatpath} != "." ]] ; then
+               CXX="${gnatpath}/${CXX}"
+               GNATBIND="${gnatpath}/${GNATBIND}"
+               GNATLINK="${gnatpath}/${GNATLINK}"
+               GNATLS="${gnatpath}/${GNATLS}"
+       fi
+       mkdir bin || die
+       ln -s $(which ${GCC}) bin/gcc || die
+       ln -s $(which ${CXX}) bin/g++ || die
+       ln -s $(which ${GNATMAKE}) bin/gnatmake || die
+       ln -s $(which ${GNATBIND}) bin/gnatbind || die
+       ln -s $(which ${GNATLINK}) bin/gnatlink || die
+       ln -s $(which ${GNATLS}) bin/gnatls || die
+
+       cd ..
+       mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
+       mv ${INTFDIR} ${MYP}/gcc/ada/gcc-interface || die
+       eapply "${FILESDIR}"/${P}-gentoo.patch
+       rm patch/32*.patch || die
+       cd -
+       sed -i \
+               -e 's:$(P) ::g' \
+               gcc/ada/gcc-interface/Makefile.in \
+               || die "sed failed"
+       toolchain_src_prepare
+}
+
+src_configure() {
+       export PATH=${PWD}/bin:${PATH}
+       downgrade_arch_flags "$(gcc-version)"
+       toolchain_src_configure
+}
+
+pkg_postinst() {
+       toolchain_pkg_postinst
+       einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
+       einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
+       einfo "Even if the c/c++ compilers are using almost the same patched"
+       einfo "source as the sys-devel/gcc package its use is not extensively"
+       einfo "tested, and not supported for updating your system, except for 
ada"
+       einfo "related packages"
+}

diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index d3aadec0e51..d22ee4a1f67 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -10,6 +10,7 @@
                        Window Toolkit (AWT) peer support on top of GTK+</flag>
                <flag name="bootstrap">Used to bootstrap gnat-gpl</flag>
                <flag name="cilk">Support the Cilk Plus language (C/C++ based 
languages for parallel programming)</flag>
+               <flag name="d">Enable support for the D programming 
language</flag>
                <flag name="fixed-point">Enable fixed-point arithmetic support 
for MIPS
                        targets in gcc (Warning: significantly increases 
compile time!)
                </flag>
@@ -21,6 +22,7 @@
                <flag name="libssp">Build SSP support into a dedicated library 
rather
                        than use the code in the C library (DO NOT ENABLE THIS 
IF YOU DON'T
                        KNOW WHAT IT DOES)</flag>
+               <flag name="lto">Build using Link Time Optimizations 
(LTO)</flag>
                <flag name="nopie">Disable PIE support (NOT FOR GENERAL 
USE)</flag>
                <flag name="nossp">Disable SSP support (NOT FOR GENERAL 
USE)</flag>
                <flag name="nptl">Enable support for Native POSIX Threads 
Library, the new threading module (requires linux-2.6 or better usually)</flag>

Reply via email to