Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/files/, dev-lang/gnat-gpl/
Date: Sat, 09 Jun 2018 18:42:12
Message-Id: 1528569673.e547d8901c640355c266a003976053ebcfd6884d.tupone@gentoo
1 commit: e547d8901c640355c266a003976053ebcfd6884d
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 9 18:39:25 2018 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 9 18:41:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e547d890
7
8 dev-lang/gnat-gpl: Version bump to gnat-gpl-2018
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-lang/gnat-gpl/Manifest | 5 +
13 dev-lang/gnat-gpl/files/gnat-gpl-2018-gentoo.patch | 18 ++
14 dev-lang/gnat-gpl/gnat-gpl-2018.ebuild | 192 +++++++++++++++++++++
15 3 files changed, 215 insertions(+)
16
17 diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
18 index 0b0f6a1f33a..0257e4a64d0 100644
19 --- a/dev-lang/gnat-gpl/Manifest
20 +++ b/dev-lang/gnat-gpl/Manifest
21 @@ -8,9 +8,14 @@ DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af
22 DIST gcc-6-gpl-2017-src.tar.gz 88045488 BLAKE2B 5df712eadef723df9057653e49d215cef6b59032e4b4a62c8622a7b735c660f42ec4135dba628a2080a7540d407186a4e4b1eb373e937374bc4e407dc9afe97d SHA512 bf8f786b5ad28a6b7d184fb5263424b7ed62154e308e259b61c24a577efdae56939fbaabc1fc53a0f467702c1e6d8598dc6e489ce074724799130a793cfb146e
23 DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
24 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
25 +DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
26 +DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5 SHA512 24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33
27 +DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
28 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
29 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
30 +DIST gcc-interface-7-gpl-2018-src.tar.gz 339461 BLAKE2B e6009c0b287b1cd8f055226e6919c12f2ba08f8ef24101608691b05b70a7fb0ca708e2ecd126499fb84a126436d3841f1a13be0b6d3442ef3bd3871391f8e1d5 SHA512 9dc942a39dd983778756be2951b4c66ac3835bf456dc389f80ffbafdacde4ebcb80720ac9eca8fef8734d6d052c061db37c88dba642d85add10940164d120381
31 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
32 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
33 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
34 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
35 +DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
36
37 diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2018-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2018-gentoo.patch
38 new file mode 100644
39 index 00000000000..b778900083e
40 --- /dev/null
41 +++ b/dev-lang/gnat-gpl/files/gnat-gpl-2018-gentoo.patch
42 @@ -0,0 +1,18 @@
43 +--- gcc-7-gpl-2018-src/gcc/ada/osint.adb.old 2017-03-10 21:58:02.600710156 +0100
44 ++++ gcc-7-gpl-2018-src/gcc/ada/osint.adb 2017-03-10 21:59:38.033983293 +0100
45 +@@ -2229,14 +2229,11 @@
46 + for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
47 + if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
48 + End_Of_Prefix := J - 1;
49 ++ Start_Of_Suffix := J + Prog'Length;
50 + exit;
51 + end if;
52 + end loop;
53 +
54 +- if End_Of_Prefix > 1 then
55 +- Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
56 +- end if;
57 +-
58 + -- Create the new program name
59 +
60 + return new String'
61
62 diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018.ebuild
63 new file mode 100644
64 index 00000000000..ad01178879b
65 --- /dev/null
66 +++ b/dev-lang/gnat-gpl/gnat-gpl-2018.ebuild
67 @@ -0,0 +1,192 @@
68 +# Copyright 1999-2018 Gentoo Foundation
69 +# Distributed under the terms of the GNU General Public License v2
70 +
71 +EAPI="5"
72 +
73 +PATCH_VER="1.4"
74 +
75 +TOOLCHAIN_GCC_PV=7.3.0
76 +
77 +inherit eutils toolchain-funcs toolchain
78 +
79 +REL=7
80 +MYP=gcc-${REL}-gpl-${PV}-src
81 +BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
82 +BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
83 +
84 +DESCRIPTION="GNAT Ada Compiler - GPL version"
85 +HOMEPAGE="http://libre.adacore.com/"
86 +SRC_URI+="
87 + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
88 + -> ${P}-src.tar.gz
89 + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7
90 + -> ${MYP}.tar.gz
91 + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6
92 + -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
93 + bootstrap? (
94 + amd64? (
95 + http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
96 + ${BTSTRP_AMD64}.tar.gz
97 + )
98 + x86? (
99 + http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
100 + ${BTSTRP_X86}.tar.gz
101 + )
102 + )"
103 +
104 +LICENSE+=" GPL-2 GPL-3"
105 +SLOT="${TOOLCHAIN_GCC_PV}"
106 +KEYWORDS="~amd64 ~x86"
107 +IUSE="bootstrap"
108 +
109 +RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
110 +DEPEND="${RDEPEND}
111 + elibc_glibc? ( >=sys-libs/glibc-2.13 )
112 + >=sys-devel/binutils-2.20"
113 +
114 +S="${WORKDIR}"/${MYP}
115 +PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
116 +FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
117 +
118 +pkg_setup() {
119 + toolchain_pkg_setup
120 +
121 + if use amd64; then
122 + BTSTRP=${BTSTRP_AMD64}
123 + else
124 + BTSTRP=${BTSTRP_X86}
125 + fi
126 +
127 + if use bootstrap; then
128 + GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
129 + else
130 + GCC=${ADA:-$(tc-getCC)}
131 + fi
132 +
133 + gnatbase=$(basename ${GCC})
134 + gnatpath=$(dirname ${GCC})
135 +
136 + GNATMAKE=${gnatbase/gcc/gnatmake}
137 + if [[ ${gnatpath} != "." ]] ; then
138 + GNATMAKE="${gnatpath}/${GNATMAKE}"
139 + fi
140 +}
141 +
142 +src_unpack() {
143 + if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
144 + eerror "You need a gcc compiler that provides the Ada Compiler:"
145 + eerror "1) use gcc-config to select the right compiler or"
146 + eerror "2) set the bootstrap use flag"
147 + die "ada compiler not available"
148 + fi
149 +
150 + GCC_A_FAKEIT="
151 + ${P}-src.tar.gz
152 + ${MYP}.tar.gz
153 + gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
154 + if use bootstrap; then
155 + GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
156 + fi
157 +
158 + toolchain_src_unpack
159 + if use bootstrap; then
160 + rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
161 + fi
162 +}
163 +
164 +src_prepare() {
165 + CC=${GCC}
166 + CXX="${gnatbase/gcc/g++}"
167 + GNATBIND="${gnatbase/gcc/gnatbind}"
168 + GNATLINK="${gnatbase/gcc/gnatlink}"
169 + GNATLS="${gnatbase/gcc/gnatls}"
170 + if [[ ${gnatpath} != "." ]] ; then
171 + CXX="${gnatpath}/${CXX}"
172 + GNATBIND="${gnatpath}/${GNATBIND}"
173 + GNATLINK="${gnatpath}/${GNATLINK}"
174 + GNATLS="${gnatpath}/${GNATLS}"
175 + fi
176 + mkdir bin || die
177 + ln -s $(which ${GCC}) bin/gcc || die
178 + ln -s $(which ${CXX}) bin/g++ || die
179 + ln -s $(which ${GNATMAKE}) bin/gnatmake || die
180 + ln -s $(which ${GNATBIND}) bin/gnatbind || die
181 + ln -s $(which ${GNATLINK}) bin/gnatlink || die
182 + ln -s $(which ${GNATLS}) bin/gnatls || die
183 +
184 + echo ${TOOLCHAIN_GCC_PV} > gcc/BASE-VER
185 +
186 + cd ..
187 + mv ${P}-src/src/ada ${MYP}/gcc/ || die
188 + mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
189 + epatch "${FILESDIR}"/${P}-gentoo.patch
190 + rm patch/91_all_bmi-i386-PR-target-81763.patch || die
191 + rm patch/93_all_copy-constructible-fix.patch || die
192 + cd -
193 + sed -i \
194 + -e 's:$(P) ::g' \
195 + gcc/ada/gcc-interface/Makefile.in \
196 + || die "sed failed"
197 + toolchain_src_prepare
198 +}
199 +
200 +src_configure() {
201 + export PATH=${PWD}/bin:${PATH}
202 + local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
203 + GCC_BRANCH_VER=$(gcc-version)
204 + downgrade_arch_flags
205 + GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
206 + toolchain_src_configure \
207 + --enable-languages=ada \
208 + --disable-libada
209 +}
210 +
211 +src_compile() {
212 + unset ADAFLAGS
213 + toolchain_src_compile
214 + gcc_do_make "-C gcc gnatlib-shared"
215 + ln -s gcc ../build/prev-gcc || die
216 + ln -s ${CHOST} ../build/prev-${CHOST} || die
217 + gcc_do_make "-C gcc gnattools"
218 +}
219 +
220 +src_install() {
221 + toolchain_src_install
222 + cd "${D}"${BINPATH}
223 + for x in gnat*; do
224 + # For some reason, g77 gets made instead of ${CTARGET}-g77...
225 + # this should take care of that
226 + if [[ -f ${x} ]] ; then
227 + # In case they're hardlinks, clear out the target first
228 + # otherwise the mv below will complain.
229 + rm -f ${CTARGET}-${x}
230 + mv ${x} ${CTARGET}-${x}
231 + fi
232 +
233 + if [[ -f ${CTARGET}-${x} ]] ; then
234 + if ! is_crosscompile ; then
235 + ln -sf ${CTARGET}-${x} ${x}
236 + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
237 + /usr/bin/${x}-${GCC_CONFIG_VER}
238 + fi
239 + # Create versioned symlinks
240 + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
241 + /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
242 + fi
243 +
244 + if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
245 + rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
246 + ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
247 + fi
248 + done
249 +}
250 +
251 +pkg_postinst () {
252 + toolchain_pkg_postinst
253 + einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
254 + einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
255 + einfo "Even if the c/c++ compilers are using almost the same patched"
256 + einfo "source as the sys-devel/gcc package its use is not extensively"
257 + einfo "tested, and not supported for updating your system, except for ada"
258 + einfo "related packages"
259 +}