1 |
commit: 1f4b3361525c0341016be67744b97b91afa32938 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 17 14:10:01 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 17 14:10:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f4b3361 |
7 |
|
8 |
dev-lang/gnat-gpl: Stabilize and remove old |
9 |
|
10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild | 214 ------------------------------ |
14 |
dev-lang/gnat-gpl/gnat-gpl-2016-r2.ebuild | 2 +- |
15 |
2 files changed, 1 insertion(+), 215 deletions(-) |
16 |
|
17 |
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild |
18 |
deleted file mode 100644 |
19 |
index 5d44cf0a9f7..00000000000 |
20 |
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,214 +0,0 @@ |
23 |
-# Copyright 1999-2018 Gentoo Authors |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
- |
26 |
-EAPI="5" |
27 |
- |
28 |
-PATCH_VER="1.3" |
29 |
-UCLIBC_VER="1.0" |
30 |
- |
31 |
-# Hardened gcc 4 stuff |
32 |
-PIE_VER="0.6.4" |
33 |
-SPECS_VER="0.2.0" |
34 |
-SPECS_GCC_VER="4.4.3" |
35 |
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default |
36 |
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" |
37 |
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64" |
38 |
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm" |
39 |
-# uclibc need tls and nptl support for SSP support |
40 |
-# uclibc need to be >= 0.9.33 |
41 |
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" |
42 |
-#end Hardened stuff |
43 |
- |
44 |
-TOOLCHAIN_GCC_PV=4.9.4 |
45 |
- |
46 |
-inherit eutils toolchain-funcs toolchain |
47 |
- |
48 |
-REL=4.9 |
49 |
-MYP=gcc-${REL}-gpl-${PV}-src |
50 |
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin |
51 |
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin |
52 |
- |
53 |
-DESCRIPTION="GNAT Ada Compiler - GPL version" |
54 |
-HOMEPAGE="http://libre.adacore.com/" |
55 |
-SRC_URI+=" |
56 |
- http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f |
57 |
- -> ${P}-src.tar.gz |
58 |
- http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db |
59 |
- -> ${MYP}.tar.gz |
60 |
- http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d |
61 |
- -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz |
62 |
- bootstrap? ( |
63 |
- amd64? ( |
64 |
- http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> |
65 |
- ${BTSTRP_AMD64}.tar.gz |
66 |
- ) |
67 |
- x86? ( |
68 |
- http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> |
69 |
- ${BTSTRP_X86}.tar.gz |
70 |
- ) |
71 |
- )" |
72 |
- |
73 |
-LICENSE+=" GPL-2 GPL-3" |
74 |
-SLOT="${TOOLCHAIN_GCC_PV}" |
75 |
-KEYWORDS="amd64 x86" |
76 |
-IUSE="bootstrap" |
77 |
- |
78 |
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}" |
79 |
-DEPEND="${RDEPEND} |
80 |
- elibc_glibc? ( >=sys-libs/glibc-2.8 ) |
81 |
- >=sys-devel/binutils-2.20" |
82 |
- |
83 |
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" |
84 |
- |
85 |
-S="${WORKDIR}"/${MYP} |
86 |
- |
87 |
-FSFGCC=gcc-${TOOLCHAIN_GCC_PV} |
88 |
- |
89 |
-pkg_setup() { |
90 |
- toolchain_pkg_setup |
91 |
- |
92 |
- if use amd64; then |
93 |
- BTSTRP=${BTSTRP_AMD64} |
94 |
- else |
95 |
- BTSTRP=${BTSTRP_X86} |
96 |
- fi |
97 |
- if use bootstrap; then |
98 |
- GCC="${WORKDIR}"/${BTSTRP}/bin/gcc |
99 |
- else |
100 |
- GCC=${ADA:-$(tc-getCC)} |
101 |
- fi |
102 |
- CC=${GCC} |
103 |
- local base=$(basename ${GCC}) |
104 |
- CXX="${base/gcc/g++}" |
105 |
- GNATMAKE="${base/gcc/gnatmake}" |
106 |
- GNATBIND="${base/gcc/gnatbind}" |
107 |
- if [[ ${base} != ${GCC} ]] ; then |
108 |
- local path=$(dirname ${GCC}) |
109 |
- GNATMAKE="${path}/${GNATMAKE}" |
110 |
- GNATBIND="${path}/${GNATBIND}" |
111 |
- CXX="${path}/${CXX}" |
112 |
- fi |
113 |
-} |
114 |
- |
115 |
-src_unpack() { |
116 |
- if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then |
117 |
- eerror "You need a gcc compiler that provides the Ada Compiler:" |
118 |
- eerror "1) use gcc-config to select the right compiler or" |
119 |
- eerror "2) set the bootstrap use flag" |
120 |
- die "ada compiler not available" |
121 |
- fi |
122 |
- |
123 |
- GCC_A_FAKEIT="${P}-src.tar.gz |
124 |
- ${MYP}.tar.gz |
125 |
- ${FSFGCC}.tar.bz2 |
126 |
- gcc-interface-${REL}-gpl-${PV}-src.tar.gz" |
127 |
- if use bootstrap; then |
128 |
- GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz" |
129 |
- fi |
130 |
- |
131 |
- toolchain_src_unpack |
132 |
- if use bootstrap; then |
133 |
- rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die |
134 |
- fi |
135 |
-} |
136 |
- |
137 |
-src_prepare() { |
138 |
- mv ../${P}-src/src/ada gcc/ || die |
139 |
- mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die |
140 |
- |
141 |
- sed -i \ |
142 |
- -e "s:gnatmake:${GNATMAKE}:g" \ |
143 |
- gcc/ada/Make-generated.in || die "sed failed" |
144 |
- |
145 |
- sed -i \ |
146 |
- -e "/xoscons/s:gnatmake:${GNATMAKE}:g" \ |
147 |
- gcc/ada/gcc-interface/Makefile.in || die "sed failed" |
148 |
- |
149 |
- mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die |
150 |
- mv ../${FSFGCC}/libjava . || die |
151 |
- rm -r ../${FSFGCC} || die |
152 |
- |
153 |
- cd .. |
154 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
155 |
- rm patch/10_all_default-fortify-source.patch |
156 |
- rm piepatch/34_all_gcc48_config_i386.patch |
157 |
- cd - |
158 |
- |
159 |
- if has_version '<sys-libs/glibc-2.12' ; then |
160 |
- ewarn "Your host glibc is too old; disabling automatic fortify." |
161 |
- ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315" |
162 |
- EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" |
163 |
- fi |
164 |
- |
165 |
- # Bug 638056 |
166 |
- epatch "${FILESDIR}/${P}-bootstrap.patch" |
167 |
- |
168 |
- toolchain_src_prepare |
169 |
- |
170 |
- use vanilla && return 0 |
171 |
- # Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. |
172 |
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch |
173 |
-} |
174 |
- |
175 |
-src_configure() { |
176 |
- local trueGCC_BRANCH_VER=${GCC_BRANCH_VER} |
177 |
- GCC_BRANCH_VER=$(gcc-version) |
178 |
- downgrade_arch_flags |
179 |
- GCC_BRANCH_VER=${trueGCC_BRANCH_VER} |
180 |
- toolchain_src_configure \ |
181 |
- --enable-languages=ada \ |
182 |
- --disable-libada \ |
183 |
- CC=${GCC} \ |
184 |
- GNATBIND=${GNATBIND} \ |
185 |
- GNATMAKE=yes |
186 |
-} |
187 |
- |
188 |
-src_compile() { |
189 |
- unset ADAFLAGS |
190 |
- toolchain_src_compile |
191 |
- gcc_do_make "-C gcc gnatlib-shared" |
192 |
- ln -s gcc ../build/prev-gcc || die |
193 |
- ln -s ${CHOST} ../build/prev-${CHOST} || die |
194 |
- gcc_do_make "-C gcc gnattools" |
195 |
-} |
196 |
- |
197 |
-src_install() { |
198 |
- toolchain_src_install |
199 |
- cd "${D}"${BINPATH} |
200 |
- for x in gnat*; do |
201 |
- # For some reason, g77 gets made instead of ${CTARGET}-g77... |
202 |
- # this should take care of that |
203 |
- if [[ -f ${x} ]] ; then |
204 |
- # In case they're hardlinks, clear out the target first |
205 |
- # otherwise the mv below will complain. |
206 |
- rm -f ${CTARGET}-${x} |
207 |
- mv ${x} ${CTARGET}-${x} |
208 |
- fi |
209 |
- |
210 |
- if [[ -f ${CTARGET}-${x} ]] ; then |
211 |
- if ! is_crosscompile ; then |
212 |
- ln -sf ${CTARGET}-${x} ${x} |
213 |
- dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ |
214 |
- /usr/bin/${x}-${GCC_CONFIG_VER} |
215 |
- fi |
216 |
- # Create versioned symlinks |
217 |
- dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ |
218 |
- /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} |
219 |
- fi |
220 |
- |
221 |
- if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then |
222 |
- rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} |
223 |
- ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} |
224 |
- fi |
225 |
- done |
226 |
-} |
227 |
- |
228 |
-pkg_postinst () { |
229 |
- toolchain_pkg_postinst |
230 |
- einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" |
231 |
- einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}" |
232 |
- einfo "Even if the c/c++ compilers are using almost the same patched" |
233 |
- einfo "source as the sys-devel/gcc package its use is not extensively" |
234 |
- einfo "tested, and not supported for updating your system, except for ada" |
235 |
- einfo "related packages" |
236 |
-} |
237 |
|
238 |
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r2.ebuild |
239 |
index 8474d085bc1..ff06786dc4d 100644 |
240 |
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r2.ebuild |
241 |
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r2.ebuild |
242 |
@@ -50,7 +50,7 @@ SRC_URI+=" |
243 |
|
244 |
LICENSE+=" GPL-2 GPL-3" |
245 |
SLOT="${TOOLCHAIN_GCC_PV}" |
246 |
-KEYWORDS="~amd64 ~x86" |
247 |
+KEYWORDS="amd64 x86" |
248 |
IUSE="bootstrap" |
249 |
|
250 |
RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}" |