diff options
Diffstat (limited to 'dev-lang/gnat-gpl')
| -rw-r--r-- | dev-lang/gnat-gpl/Manifest | 5 | ||||
| -rw-r--r-- | dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild | 23 | ||||
| -rw-r--r-- | dev-lang/gnat-gpl/metadata.xml | 2 |
3 files changed, 18 insertions, 12 deletions
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest index dc7d152e645c..7ce9bc4d4ce6 100644 --- a/dev-lang/gnat-gpl/Manifest +++ b/dev-lang/gnat-gpl/Manifest @@ -3,9 +3,8 @@ AUX gnat-gpl-2021-gentoo.patch 3588 BLAKE2B 87cf33a8f7f8b499b2c8775188b28992ac7d DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B 8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550 SHA512 2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6 DIST gcc-10.3.0-patches-4.tar.xz 18460 BLAKE2B 7c4b91c3beebc5fd91c0fdbeec6512c141bd78759a02aa7fff32dd30025ef41db1d57280e50db575f46cc0061a480ced9259410e9875b1dc0048886df469c4c9 SHA512 3befbcdec84e583966aad37d1a08c1863f39eb877296c5991348db9d37cc8359197f23cb3b8fa1b0f4d01497dfd2ebaa393e1a459267c19a0976fb535e463ec8 DIST gcc-interface-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B 75f941a7635f2880cc0192acb49d8e7f567baca7530fb981be14dc6cb1bf46fda0e3c043c8703cdbeeb242b548894e0bc6787adfff0f27198354d150e6e36386 SHA512 0251a93d20c59cc4705963438880fe265e2e0bb94a35b7ddaaf03e9efae60e044e585a2204d0773a46f17b3b774e4d0c73adf852f5d06ba17373d26ed580ca8d -DIST gcc-validate-failures-a447cd6dee206facb66720bdacf0c765a8b09f33.py 27537 BLAKE2B 96c7474de0bc50ab890a91551412398c979396c43aa237a4b6d8baa98ce7fda2cc9f5a755a03fd9d055d885ee2fb40ba29644a0649c24398361ce75a20fae634 SHA512 409434953351cf1f2287f1e4a4fbde5b28a27add35ddd284080acec71b33cb4ec5e1c07f41a79fac060bd6f1eedd198812495141923e410ded907429fe515f83 DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e -EBUILD gnat-gpl-2021-r5.ebuild 4778 BLAKE2B 4b82a10653adc40cefcb964e3d1889a26ddd717e55cd18e1d4c3e63569392dbc3d4871b5e33122928631456ba7cbccf36730378f41295479cc4fb4020311226a SHA512 c70584f6379408ae38dfc409011edc89042f98ba1397913b67105001b94f609f9542cf38b51e88e474788736d2c67f27039cacd143d9234c061ee03c362a890a -MISC metadata.xml 2104 BLAKE2B c7a3edb581a8a82c65642269156b8d2eece24342387e95e4afd4786d7155a91ed67f875a8bf720e1bb0b8b7825730e8b4656cefd52e8e0b978d78fb5659fc67b SHA512 a699bd522f23376786a6690f56db22cdc3b07413f4c25d68f7d3ef63b5645bce02d4ee05e0338bcf9e119efe43d32d51420db921e475d7a2d7dce34c4e1dec84 +EBUILD gnat-gpl-2021-r5.ebuild 5041 BLAKE2B a2481f15f4167fe9ddb0f9d2735b8f4e336cb521846398f3cd6afae4620b01d61bfda4a9d698e7664f5bb7c202b0f158438a191abc77324beadd786eefe8af90 SHA512 a657eb8fe634fbc049f7dbe229e07a540a48221da87cd2cbf2f7728f4fbb407e6499d2574c5c6a561444745f124b52f81bf76cd036a46d648dd3121a47fd7f6a +MISC metadata.xml 2123 BLAKE2B 37449000a0a107ef9cddeedb867b54709108ea3ee5be59aa5300cdccb1e6a55ddf54df3cb35b9d198ee8d251ede8622d29a0f73800227faca2f621e7a07a11bf SHA512 e979fcde61993c462b816ce1917ae801843b1f44a659342fdf5020d10eacc139681ca54f5fc80b6d70eae26bd33861f1de4cb1d2f9b0ae13446fd9a9bd5b6dff diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild index 547c25989494..442fabf6223f 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild @@ -7,7 +7,6 @@ PATCH_GCC_VER=10.3.0 PATCH_VER="4" TOOLCHAIN_GCC_PV=10.3.1 -PYTHON_COMPAT=( python3_{10..12} ) REL=10 MYP=gcc-${REL}-${PV}-20210519-19A74-src @@ -25,7 +24,7 @@ GCC_TARBALL_SRC_URI=" -> ${MYP}.tar.gz ${BASE_URI}/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=${INTFDIR}.tar.gz -> ${INTFDIR}.tar.gz - bootstrap? ( + !system-bootstrap? ( amd64? ( ${BASE_URI}/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=${BTSTRP_AMD64}.tar.gz&rand=1193 -> ${BTSTRP_AMD64}.tar.gz @@ -36,14 +35,14 @@ GCC_TARBALL_SRC_URI=" ) )" -inherit toolchain-funcs toolchain +inherit flag-o-matic 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" +IUSE="+ada system-bootstrap" RESTRICT="test" RDEPEND="!=sys-devel/gcc-${TOOLCHAIN_GCC_PV}*" @@ -65,7 +64,7 @@ src_prepare() { BTSTRP=${BTSTRP_X86} fi - if use bootstrap; then + if ! use system-bootstrap; then GCC="${WORKDIR}"/${BTSTRP}/bin/gcc else GCC=${ADA:-$(tc-getCC)} @@ -79,10 +78,10 @@ src_prepare() { GNATMAKE="${gnatpath}/${GNATMAKE}" fi - if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then + if use system-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 or" + eerror "2) disable the system-bootstrap use flag or" eerror "3) set ADA to a working gcc ada compiler" die "ada compiler not available" fi @@ -90,7 +89,7 @@ src_prepare() { local bundledchost="" use amd64 && local bundledchost="x86_64" use x86 && local bundledchost="i686" - if use bootstrap; then + if ! use system-bootstrap; then rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/ld \ || die ln -s /usr/bin/$CHOST-ld \ @@ -146,7 +145,15 @@ src_prepare() { src_configure() { export PATH=${PWD}/bin:${PATH} + + # This version is GCC 4.7.4 with a bolted-on newer GNAT; be very + # conservative, we just want it to build for bootstrapping proper + # sys-devel/gcc[ada]. We don't need it to be fast. + strip-flags + strip-unsupported-flags + filter-lto downgrade_arch_flags "$(gcc-version)" + toolchain_src_configure } diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml index 45bf56ac30ee..626b079044db 100644 --- a/dev-lang/gnat-gpl/metadata.xml +++ b/dev-lang/gnat-gpl/metadata.xml @@ -6,7 +6,6 @@ </maintainer> <use> <flag name="ada">Build the ADA language (GNAT) frontend</flag> - <flag name="bootstrap">Used to bootstrap gnat-gpl</flag> <flag name="cet" restrict=">=dev-lang/gnat-gpl-2021">Enable support for Intel Control Flow Enforcement Technology (CET)</flag> <flag name="d">Enable support for the D programming language</flag> <flag name="default-stack-clash-protection">Build packages with stack clash protection on by default</flag> @@ -29,6 +28,7 @@ <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag> <flag name="rust">Build support for the Rust language, installs gccrs.</flag> <flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag> + <flag name="system-bootstrap">Bootstrap using installed Ada compiler</flag> <flag name="systemtap">enable systemtap static probe points</flag> <flag name="ssp">Build packages with stack smashing protector on by default</flag> <flag name="vtv">Build support for virtual table verification (a C++ hardening feature)</flag> |