diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
tree | 44068672445b1418489aed82de58df3c470289e7 /dev-lang/gnat-gpl | |
parent | 0f15659d48c193027158492acb726297501202c5 (diff) |
gentoo resync : 04.01.2022
Diffstat (limited to 'dev-lang/gnat-gpl')
-rw-r--r-- | dev-lang/gnat-gpl/Manifest | 11 | ||||
-rw-r--r-- | dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch | 10 | ||||
-rw-r--r-- | dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild | 137 | ||||
-rw-r--r-- | dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/gnat-gpl/metadata.xml | 1 |
5 files changed, 22 insertions, 147 deletions
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest index bc0de02f9cfa..61997703f4e6 100644 --- a/dev-lang/gnat-gpl/Manifest +++ b/dev-lang/gnat-gpl/Manifest @@ -2,22 +2,17 @@ AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff AUX gnat-gpl-2019-gentoo.patch 1408 BLAKE2B 5234c542cc33af3c1bcb256fbe266613ec2e9f0b21d143029bf527ee03b4b363b2de7467eb79fadf4c8e8d3f39e589cfa3c0fadee1723e87938c74b8547d5ecf SHA512 2b9f0081d7aae5c71f73ebf43683fde033966288a937769e9b49e21805f31b5f0b4190e31431def58fcc93cd09f9b0e061096cffe61616073612f53d7e3e724b AUX gnat-gpl-2020-gentoo.patch 2146 BLAKE2B 1abd27bece2366d89603b9152730ae9d4949e7298c90e2147bcad79e022fa42a64bb843aed8870a30fab121f03e5ef2c681d0423bcd1cc844078c7650e11ccf5 SHA512 29c06d359dc0603ec326d4ee5be493105e48269a576b364537012a512db0a9eb9e4609495efd6f9c3b82a7bc9974eec81978c36e1cfc1ff936b02492c18fd052 -AUX gnat-gpl-2021-gentoo.patch 1631 BLAKE2B 445343bcc5e12ada65090ba9f9a77bcf63f09f2a01eaad8732c645f3910e64068402ff01c16e6b17e6b78f2c764a1a03ec58c3cf3029b49a93c8f8ae6ba516d1 SHA512 04ae6351815c23f71e8164c5eb5cc9577303ae17331eda6282fd56d88ad2c824f7b3fae84050e1a87b2d3f081ea0dceb4128dd5d3a2fb464c363d1f2e3c08cc6 +AUX gnat-gpl-2021-gentoo.patch 2039 BLAKE2B 323255e2c0942788eed9a1ce2977a153ddb2e1693136c935f41f80ead4dccb756388e21255055e01f3a749f7a0988cfcf93b3ba02cbab454120c7c81b6e7a9d4 SHA512 cfdf1ec863c3df43a80f7cdb54faeff75d77780473b7a1d14ffa291c1905bfe27d05a907e15c1b31fa980d926e57352bd0b73221458e87260651cc6b092da3c6 DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B 8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550 SHA512 2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084 -DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 8dc1983317517e9d7221ffd3d1c804367c98a7142b3964e6382ee037da2cfebc9e044640549c77905646727e97ba108445b00f36916a65c326e862230608a7dc SHA512 50933d7eab927a2d118e01c5cb85336203544f6fbc3f245a148e952320d6f8452fcd5d355019a144e8af03357d129bb145397506db0a62fddf1f746b6671e7fc -DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf SHA512 0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5 DIST gcc-9-2020-20200429-19AA7-src.tar.gz 101030094 BLAKE2B 843d7a92f206a08aa6c0fb41b8b93db494eee26c15872b8d8547685c1013559856cd83c5a4139d8ba68aa6737c0270502fd5547664b458cb8fd023f5ce9601e8 SHA512 2eaf999f4ef7f0216b7bab9963ce1cb9dd4be4d4645415183a0e0706ce0f0f119a5437c482d60db16ea152ebcb36186fc7900ec196fc7b8022d4d9cea2e5a631 DIST gcc-9.3.0-patches-5.tar.bz2 18336 BLAKE2B 8aefb94bfec041da69efdd751fe9df58cc2352e66afe7ec2090da698912e31de8a82ef588e393929f50dbc6d5967bb015f8e807f868ec19c7cf9813495fa4687 SHA512 0eedc2a33b7fa1a846a30055dcaf38ea9882d5c7b3d8a7d9145fe768d778747413b7822fc625135fa010e749fbbda51f7460e03c989dee8551c50b798a9d1aba DIST gcc-interface-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B 75f941a7635f2880cc0192acb49d8e7f567baca7530fb981be14dc6cb1bf46fda0e3c043c8703cdbeeb242b548894e0bc6787adfff0f27198354d150e6e36386 SHA512 0251a93d20c59cc4705963438880fe265e2e0bb94a35b7ddaaf03e9efae60e044e585a2204d0773a46f17b3b774e4d0c73adf852f5d06ba17373d26ed580ca8d -DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 BLAKE2B d08867737fd5a2e8aa87e61efff47757b587baff67810eb9193fe72b68578bcb130f0c1491599588d130663d908b9c6c9a604b1352aeccb79e9dd3bfef4b9f61 SHA512 c4a048725517e674cc43b7b72e3b1bdb4f1cf9d81fe3b84dd177a2fda8c7af11c3135e883072b640c8aa351625f49573727c859064683e8b5f096fdbd3990c38 DIST gcc-interface-9-2020-20200429-19B10-src.tar.gz 351113 BLAKE2B a786532194a5ac57dd91b5c207aaf4543e99a3305dccf175908bee80cc96d112b9c5531497516ad1edc33e9bcff62374dd473aed93bfb1d0aea13e017473d98e SHA512 445744a745eee5e3a686ec59f7880a3792d4fd30425a38090e40e5cc85379e6f877745d7ea61ffabb42ed177ee90f01e2309dfdd5f060027cfc86ac77fddebba -DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 79683138873b236d832939602f084058723a908e1b709b4bab72e7ae5404336d0ad7b8417eca80e1e1e3a1c260d953ac8326da41429c95729129f88caa2dd3e7 SHA512 bf93a7b877b44422513a4658b29ddd9edcc320d8ac73d3044f4ce868f10be368993e915e710ed45be287e07e9d6c117e51fa73027ed311b04458c9cae1984253 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-2019-r2.ebuild 3578 BLAKE2B a2bb2a094b2c47620ca08156962425ec8210a27ad2ef712ab99f6e759a4a4f41a8b59c09230de8d12abebcce8b271c992c3a83a129b5ef93f1e8f71462f6c217 SHA512 7fccd20ad3b6cee151b8f7a4ea3b1d6b2d882aaac3a0903502f14df7d292ebf984fe72ebeffb8fda8f36288380669da5d4da6fceec795090a36eb01b9de2b833 EBUILD gnat-gpl-2020.ebuild 3828 BLAKE2B b0b04987c3cd4cf49b6f3d8ec61a1ed84d8cf422149bbc38c2a20e9d0e9c3ee2a05fe37e45cf992caf3b3bb954a30c1eb45ad9b61fb5b6ae97efb4a4382248f6 SHA512 c84506eca5fd33270ca19141a80f921c04817f8dd8694e57b6f43ba12c8f6b9535272828339474ac1d4b508936ca52cb167c754410210cfa7d21c1c7b64157a2 -EBUILD gnat-gpl-2021-r1.ebuild 3713 BLAKE2B 3efbe60620d792182bfab5564e68f6f97366b1d6cbb72fad708dd84d5292bb9a5ec428185460b614935e74bce72b41550b2491d52bba96aef1df03bea70bcb71 SHA512 9853648ddc70365c0976bb25d3abb07cfd414a2ae324cf68555ac52606c03f3a5f2fd63095b88d312b1ba72ba3228f7e1046e22026e922b3b0954a059f8ae065 -MISC metadata.xml 2046 BLAKE2B 298c38228f5798c4eaa1eb8437d1c900e4a9cca1bf37df4556dd425bbc67edef6c1e464e45c0ec78bfc6aa96cac5e7d7fcb8f532fae0ab767067262a2a3755d9 SHA512 774c48b6a6de22a14eb6fd3df2e4b5bedafa8a223b68f4cc764fc887a96b55d0abd76208e276126c6ee0878a12c81453e1922e51b0306a90885cca675eff37f3 +EBUILD gnat-gpl-2021-r1.ebuild 3973 BLAKE2B 699a613c9ae59a08f7d7e67adae5c9d00a54b4a5cc5d024921c7b42a1add9b876863bb0f14826ff381babef44a8fdac5d7b1074f1d14124189d0a22528185201 SHA512 4dd0dc5e997ee75dbd515bb0cdd8f6c3acf4fda524630769ce16ed59156c1e2a54c5cd3bf90fb8e8f77a4d97beb90e500944ad246a34088108c7b35b55ab9b25 +MISC metadata.xml 1960 BLAKE2B e06642a8ae69d163bd2450a4dbf2350399becc0fa933780cbf1378721ec127b033cb547c7aff22d4b89724aefe933c7c0eaac55eab4a223f45d138006dd3492e SHA512 81c3ceafdc0a4d73427d6b12c1bfa41d647e8c788e71e1de09e79de4795573e35e403fd03b981beb350a6e9b55b44fd0d8a2f7279e83c23273fc150a126f2b07 diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch index 3caa2a6d996e..2bfc54c551a9 100644 --- a/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch +++ b/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch @@ -39,3 +39,13 @@ + %{fdump-scos:-fpreserve-decisions-generic}\ %{fprofile-arcs|fprofile-generate*|coverage:\ - %{!fprofile-update=singel:\ +--- a/gcc-10-2021-20210519-19A74-src/config/cet.m4 2022-01-01 11:18:09.663425422 +0100 ++++ b/gcc-10-2021-20210519-19A74-src/config/cet.m4 2022-01-01 11:18:14.809345911 +0100 +@@ -62,7 +62,6 @@ + i[[34567]]86-*-linux* | x86_64-*-linux*) + may_have_cet=yes + save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -fcf-protection" + case "$enable_cet" in + auto) + # Check if target supports multi-byte NOPs diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild deleted file mode 100644 index 173c640d4b94..000000000000 --- a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PATCH_GCC_VER=8.3.0 -PATCH_VER="4" - -TOOLCHAIN_GCC_PV=8.3.1 - -REL=8 -MYP=gcc-${REL}-${PV}-20190517-18C94-src -GNATDIR=gnat-${PV}-20190517-18C94-src -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 - -# 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 - -> ${MYP}.tar.gz - http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 - -> ${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}" -DEPEND="${RDEPEND} - elibc_glibc? ( >=sys-libs/glibc-2.13 ) - >=sys-devel/binutils-2.20" - -S="${WORKDIR}"/${MYP} -PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" - -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 - rm patch/27*.patch || die - rm patch/28*.patch || die - 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" -} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild index 3502c2c009fd..e0bcd6f39fb2 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -87,6 +87,11 @@ src_prepare() { ln -s /usr/bin/$CHOST-ld \ "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \ || die + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + || die + ln -s /usr/bin/$CHOST-as \ + "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + || die fi CC=${GCC} @@ -114,6 +119,9 @@ src_prepare() { eapply "${FILESDIR}"/${P}-gentoo.patch cd - sed -i \ + -e 's:-fcf-protection":":' \ + lto-plugin/configure || die + sed -i \ -e 's:$(P) ::g' \ gcc/ada/gcc-interface/Makefile.in \ || die "sed failed" diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml index 4587287c0bb6..31ab10903d16 100644 --- a/dev-lang/gnat-gpl/metadata.xml +++ b/dev-lang/gnat-gpl/metadata.xml @@ -15,7 +15,6 @@ <flag name="go">Build the GCC Go language frontend.</flag> <flag name="graphite">Add support for the framework for loop optimizations based on a polyhedral intermediate representation</flag> - <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag> <flag name="libssp">Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag> |