forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-lang/gnat-gpl: version bump to 2021
Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone <[email protected]>
- Loading branch information
Showing
3 changed files
with
177 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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:\ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} |