commit: 13a52394b9e634151204ccc70840c0c0e91ea4d1
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 19:46:37 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 19:46:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a52394
dev-lang/gnat-gpl: drop 2020
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 | 53 --------
dev-lang/gnat-gpl/gnat-gpl-2020.ebuild | 138 ---------------------
3 files changed, 195 deletions(-)
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index b6481237bd30..4d012eaa794c 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -1,11 +1,7 @@
DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B
8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550
SHA512
2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6
DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B
13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a
SHA512
c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
DIST gcc-10.3.0-patches-4.tar.xz 18460 BLAKE2B
7c4b91c3beebc5fd91c0fdbeec6512c141bd78759a02aa7fff32dd30025ef41db1d57280e50db575f46cc0061a480ced9259410e9875b1dc0048886df469c4c9
SHA512
3befbcdec84e583966aad37d1a08c1863f39eb877296c5991348db9d37cc8359197f23cb3b8fa1b0f4d01497dfd2ebaa393e1a459267c19a0976fb535e463ec8
-DIST gcc-9-2020-20200429-19AA7-src.tar.gz 101030094 BLAKE2B
843d7a92f206a08aa6c0fb41b8b93db494eee26c15872b8d8547685c1013559856cd83c5a4139d8ba68aa6737c0270502fd5547664b458cb8fd023f5ce9601e8
SHA512
2eaf999f4ef7f0216b7bab9963ce1cb9dd4be4d4645415183a0e0706ce0f0f119a5437c482d60db16ea152ebcb36186fc7900ec196fc7b8022d4d9cea2e5a631
-DIST gcc-9.3.0-patches-5.tar.bz2 18336 BLAKE2B
8aefb94bfec041da69efdd751fe9df58cc2352e66afe7ec2090da698912e31de8a82ef588e393929f50dbc6d5967bb015f8e807f868ec19c7cf9813495fa4687
SHA512
0eedc2a33b7fa1a846a30055dcaf38ea9882d5c7b3d8a7d9145fe768d778747413b7822fc625135fa010e749fbbda51f7460e03c989dee8551c50b798a9d1aba
DIST gcc-interface-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B
75f941a7635f2880cc0192acb49d8e7f567baca7530fb981be14dc6cb1bf46fda0e3c043c8703cdbeeb242b548894e0bc6787adfff0f27198354d150e6e36386
SHA512
0251a93d20c59cc4705963438880fe265e2e0bb94a35b7ddaaf03e9efae60e044e585a2204d0773a46f17b3b774e4d0c73adf852f5d06ba17373d26ed580ca8d
-DIST gcc-interface-9-2020-20200429-19B10-src.tar.gz 351113 BLAKE2B
a786532194a5ac57dd91b5c207aaf4543e99a3305dccf175908bee80cc96d112b9c5531497516ad1edc33e9bcff62374dd473aed93bfb1d0aea13e017473d98e
SHA512
445744a745eee5e3a686ec59f7880a3792d4fd30425a38090e40e5cc85379e6f877745d7ea61ffabb42ed177ee90f01e2309dfdd5f060027cfc86ac77fddebba
-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
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch
b/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch
deleted file mode 100644
index a4987b54f610..000000000000
--- a/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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:\
---- a/gcc-9-2020-20200429-19AA7-src/gcc/ada/init.c 2021-12-10
22:12:34.061054044 +0100
-+++ b/gcc-9-2020-20200429-19AA7-src/gcc/ada/init.c 2021-12-10
22:13:36.033109326 +0100
-@@ -581,9 +581,6 @@
- #define HAVE_GNAT_ALTERNATE_STACK 1
- /* This must be in keeping with System.OS_Interface.Alternate_Stack_Size.
- It must be larger than MINSIGSTKSZ and hopefully near 2 * SIGSTKSZ. */
--# if 16 * 1024 < MINSIGSTKSZ
--# error "__gnat_alternate_stack too small"
--# endif
- char __gnat_alternate_stack[16 * 1024];
- #endif
-
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
deleted file mode 100644
index a70c2cc890dc..000000000000
--- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_GCC_VER=9.3.0
-PATCH_VER="5"
-
-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 )"
-
-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 && [[ -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 or"
- eerror "3) set ADA to a working gcc ada compiler"
- die "ada compiler not available"
- fi
-
- if use bootstrap; then
- rm
"${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \
- || die
- ln -s /usr/bin/$CHOST-ld \
-
"${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/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 $(type -P ${GCC}) bin/gcc || die
- ln -s $(type -P ${CXX}) bin/g++ || die
- ln -s $(type -P ${GNATMAKE}) bin/gnatmake || die
- ln -s $(type -P ${GNATBIND}) bin/gnatbind || die
- ln -s $(type -P ${GNATLINK}) bin/gnatlink || die
- ln -s $(type -P ${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"
-}
