dev-lang/gnat-gpl: fix build with glibc-2.31

Closes: https://bugs.gentoo.org/716278
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index c656e1a98a23e50163414500781e4382f65ca8a1..9a9290e817bb17d33549ca072465ac3abc26d32a 100644 (file)
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -11,6 +11,7 @@ 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-3.tar.bz2 15944 BLAKE2B f1ae61be794123f34ca88c279bfe33abadd37eea0ca0267ac9c0c77707dc8305063a7ecc2e23511c281f7e903dff349fef016d3fbbf3237acf383fe1639d4b7b SHA512 f43d86a55c932df4a494c6b687101a2992b91b1a4e01677165ed0f04de6108150ef713762f71d0ef764dbd4bad97a99d15fcb42c23e4bb42d83a866ff2d0c614
+DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf SHA512 0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5
 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

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
new file mode 100644 (file)
index 0000000..d77a6a4
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCH_GCC_VER=8.3.0
+PATCH_VER="4"
+
+TOOLCHAIN_GCC_PV=8.3.1
+
+REL=8
+MYP=gcc-${REL}-${PV}-20190517-18C94-src
+GNATDIR=gnat-${PV}-20190517-18C94-src
+INTFDIR=gcc-interface-${REL}-${PV}-20190510-18F59-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="
+       http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49
+               -> ${GNATDIR}.tar.gz
+       http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049
+               -> ${MYP}.tar.gz
+       http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50
+               -> ${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? ( 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/${CHOST}/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/27*.patch || die
+       rm patch/28*.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"
+}