commit: dde9032814084733a807580a4f691b941d2106d4 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Dec 18 21:50:22 2021 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sat Dec 18 21:50:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde90328
dev-lang/gnat-gpl: fix ld call Closes: https://bugs.gentoo.org/829311 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-lang/gnat-gpl/Manifest | 1 - dev-lang/gnat-gpl/gnat-gpl-2020.ebuild | 6 +- dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild | 6 +- dev-lang/gnat-gpl/gnat-gpl-2021.ebuild | 133 ------------------------------ 4 files changed, 10 insertions(+), 136 deletions(-) diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest index 72e81e2f681f..1d1e186e8831 100644 --- a/dev-lang/gnat-gpl/Manifest +++ b/dev-lang/gnat-gpl/Manifest @@ -1,5 +1,4 @@ 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-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084 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 diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild index 95d270cf4dc4..d16608ebfedc 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild @@ -84,7 +84,11 @@ src_prepare() { GNATMAKE="${gnatpath}/${GNATMAKE}" fi if use bootstrap; then - rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + 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} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild index 63daf9ee482e..3a59382140e8 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild @@ -82,7 +82,11 @@ src_prepare() { GNATMAKE="${gnatpath}/${GNATMAKE}" fi if use bootstrap; then - rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + 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} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild deleted file mode 100644 index 3aecf73af600..000000000000 --- a/dev-lang/gnat-gpl/gnat-gpl-2021.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# 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 -BASE_URI=https://community.download.adacore.com/v1 -# we provide own tarball below -GCC_TARBALL_SRC_URI=" - ${BASE_URI}/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=${GNATDIR}.tar.gz - -> ${GNATDIR}.tar.gz - ${BASE_URI}/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=${MYP}.tar.gz - -> ${MYP}.tar.gz - ${BASE_URI}/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=${INTFDIR}.tar.gz - -> ${INTFDIR}.tar.gz - bootstrap? ( - amd64? ( - ${BASE_URI}/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=${BTSTRP_AMD64}.tar.gz&rand=1193 - -> ${BTSTRP_AMD64}.tar.gz - ) - x86? ( - ${BASE_URI}/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=${BTSTRP_X86}.tar.gz&rand=436 - -> ${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" -}
