commit:     f7fb0c64c5349cc36f226e5f94fc458181b5d780
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 13:37:20 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat May 29 13:37:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7fb0c64

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

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-2021-gentoo.patch |  41 +++++++
 dev-lang/gnat-gpl/gnat-gpl-2021.ebuild             | 132 +++++++++++++++++++++
 3 files changed, 177 insertions(+)

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 84616d9f3bc..e221b8dc8f6 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -1,4 +1,6 @@
 DIST ecj-4.5.jar 1470676 BLAKE2B 
793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80
 SHA512 
d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
+DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B 
8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550
 SHA512 
2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6
+DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B 
ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000
 SHA512 
6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 
96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e
 SHA512 
779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 
681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc
 SHA512 
da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
 DIST gcc-4.9.4-patches-1.4.tar.bz2 27240 BLAKE2B 
26b7d08bad4b617ede2564f77ded67cc87ec6b9f6b4d4ff78b5b75c1d5739fc4049480c716075d74c9b8e23a4a3c1889796cacb3456a3982ab04a0781fe3cd04
 SHA512 
efa60a7f86e684710848182c7d040565c9cec7666e897adc02e5dea9d4c76117deece7b1f7e1f8772cdec9697bb92b762f93408824e47b3f63b4f35029f50a4b
@@ -13,6 +15,7 @@ DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 
8dc1983317517e9d7221f
 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-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B 
75f941a7635f2880cc0192acb49d8e7f567baca7530fb981be14dc6cb1bf46fda0e3c043c8703cdbeeb242b548894e0bc6787adfff0f27198354d150e6e36386
 SHA512 
0251a93d20c59cc4705963438880fe265e2e0bb94a35b7ddaaf03e9efae60e044e585a2204d0773a46f17b3b774e4d0c73adf852f5d06ba17373d26ed580ca8d
 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
@@ -20,6 +23,7 @@ DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 
BLAKE2B d08867737fd5a
 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-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B 
ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa
 SHA512 
3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
 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-2021-gentoo.patch 
b/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch
new file mode 100644
index 00000000000..3caa2a6d996
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch
@@ -0,0 +1,41 @@
+--- a/gcc-10-2021-20210519-19A74-src/gcc/ada/osint.adb 2017-03-10 
21:58:02.600710156 +0100
++++ b/gcc-10-2021-20210519-19A74-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-2021.ebuild 
b/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild
new file mode 100644
index 00000000000..81b52d26bad
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_GCC_VER=10.3.0
+PATCH_VER="1"
+
+TOOLCHAIN_GCC_PV=10.3.1
+
+REL=10
+MYP=gcc-${REL}-${PV}-20210519-19A74-src
+GNATDIR=gnat-${PV}-20210519-19A70-src
+INTFDIR=gcc-interface-${REL}-${PV}-20210519-19A75-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/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=${GNATDIR}.tar.gz
+               -> ${GNATDIR}.tar.gz
+       
https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=${MYP}.tar.gz
+               -> ${MYP}.tar.gz
+       
https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?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}"
+BDEPEND=sys-devel/binutils
+
+S="${WORKDIR}"/${MYP}
+
+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
+}
+
+src_prepare() {
+       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
+       if use bootstrap; then
+               rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
+       fi
+
+       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
+       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"
+}

Reply via email to