Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 610604 Details for
Bug 706588
migrate dev-lang/gnat-gpl off GCC_CONFIG_VER use
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
0001-dev-lang-gnat-gpl-migrate-2019-r1-from-GCC_CONFIG_VE.patch
0001-dev-lang-gnat-gpl-migrate-2019-r1-from-GCC_CONFIG_VE.patch (text/plain), 3.25 KB, created by
Sergei Trofimovich (RETIRED)
on 2020-02-01 19:23:05 UTC
(
hide
)
Description:
0001-dev-lang-gnat-gpl-migrate-2019-r1-from-GCC_CONFIG_VE.patch
Filename:
MIME Type:
Creator:
Sergei Trofimovich (RETIRED)
Created:
2020-02-01 19:23:05 UTC
Size:
3.25 KB
patch
obsolete
>From bfae456f5d16a6447c9f8654e59f0e3712a59f5c Mon Sep 17 00:00:00 2001 >From: Sergei Trofimovich <slyfox@gentoo.org> >Date: Sat, 1 Feb 2020 19:11:42 +0000 >Subject: [PATCH 1/4] dev-lang/gnat-gpl: migrate 2019-r1 from GCC_CONFIG_VER, > bug #706560 > >GCC_CONFIG_VER should be an internal variable for toolchain.eclass. >Currently it can only be the same as TOOLCHAIN_GCC_PV. > >While at it: >- use GCC_TARBALL_SRC_URI to avoid pulling unused in upstream tarball >- drop use of GCC_A_FAKEIT override in src_unpack() >- pass compiler version to downgrade_arch_flags directly > >Bug: https://bugs.gentoo.org/706588 >Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> >--- > dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild | 35 +++++++++-------------- > 1 file changed, 14 insertions(+), 21 deletions(-) > >diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild >index 5aa08b147d3..ea5425eb3f5 100644 >--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild >+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild >@@ -3,12 +3,10 @@ > > EAPI="6" > >+PATCH_GCC_VER=8.3.0 > PATCH_VER="3" > >-TOOLCHAIN_GCC_PV=8.3.0 >-GCC_CONFIG_VER=8.3.1 >- >-inherit toolchain-funcs toolchain >+TOOLCHAIN_GCC_PV=8.3.1 > > REL=8 > MYP=gcc-${REL}-${PV}-20190517-18C94-src >@@ -17,9 +15,8 @@ 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 > >-DESCRIPTION="GNAT Ada Compiler - GPL version" >-HOMEPAGE="http://libre.adacore.com/" >-SRC_URI+=" >+# 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 >@@ -37,12 +34,17 @@ SRC_URI+=" > ) > )" > >+inherit toolchain-funcs toolchain >+ >+DESCRIPTION="GNAT Ada Compiler - GPL version" >+HOMEPAGE="http://libre.adacore.com/" >+ > LICENSE+=" GPL-2 GPL-3" > KEYWORDS="amd64 x86" > IUSE="+bootstrap" > RESTRICT="!test? ( test )" > >-RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}" >+RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}" > DEPEND="${RDEPEND} > elibc_glibc? ( >=sys-libs/glibc-2.13 ) > >=sys-devel/binutils-2.20" >@@ -82,14 +84,6 @@ src_unpack() { > die "ada compiler not available" > fi > >- GCC_A_FAKEIT=" >- ${MYP}.tar.gz >- ${GNATDIR}.tar.gz >- ${INTFDIR}.tar.gz" >- if use bootstrap; then >- GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz" >- fi >- > toolchain_src_unpack > if use bootstrap; then > rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die >@@ -132,10 +126,9 @@ src_prepare() { > > src_configure() { > export PATH=${PWD}/bin:${PATH} >- local trueGCC_BRANCH_VER=${GCC_BRANCH_VER} >- GCC_BRANCH_VER=$(gcc-version) >- downgrade_arch_flags >- GCC_BRANCH_VER=${trueGCC_BRANCH_VER} >+ >+ downgrade_arch_flags "$(gcc-version)" >+ > toolchain_src_configure \ > --enable-languages=ada \ > --disable-libada >@@ -152,7 +145,7 @@ src_compile() { > > pkg_postinst () { > einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" >- einfo "The compiler binary is ${CTARGET}-gcc-${GCC_CONFIG_VER}" >+ 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" >-- >2.25.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 706588
: 610604 |
610606
|
610608
|
610610