From 3023707d355581e5dc6945aa9c8f4d59e508a8b5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 May 2023 11:30:40 +0100 Subject: gentoo auto-resync : 05:05:2023 - 11:30:40 --- sys-devel/Manifest.gz | Bin 10614 -> 10619 bytes sys-devel/gcc/Manifest | 4 +-- sys-devel/gcc/gcc-12.2.1_p20230502.ebuild | 57 ------------------------------ sys-devel/gcc/gcc-12.2.1_p20230505.ebuild | 57 ++++++++++++++++++++++++++++++ sys-devel/slibtool/Manifest | 4 +-- sys-devel/slibtool/slibtool-0.5.34.ebuild | 7 ++-- sys-devel/slibtool/slibtool-9999.ebuild | 7 ++-- 7 files changed, 69 insertions(+), 67 deletions(-) delete mode 100644 sys-devel/gcc/gcc-12.2.1_p20230502.ebuild create mode 100644 sys-devel/gcc/gcc-12.2.1_p20230505.ebuild (limited to 'sys-devel') diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index 00a8976ce3a0..c11394effa1f 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index b2abd39b20f1..e159a9917126 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -12,7 +12,7 @@ DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0e DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17 DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac50f14468844e1ee596f8ed1ccf33f55c7617464d88df7e4b3435d58fedecf640592e0661fd1be9ba163acd26dae68 SHA512 992f9cd71f9910efea401048540ba2b43360170f76ce992cf356b1ab383240f481e29c5b0ad32fa4efb2bdbb397477506cb83a825268cfbdd2cde7044d43c758 -DIST gcc-12.3-RC-20230502.tar.xz 83929612 BLAKE2B 30d62ed55631d7d1e954833c17dc14308e46fba1201f1d40a73fa77137ec3f75c743c248dd70fac52e61fd7c92238f21b23680299f89dbb389ace72f2e202604 SHA512 246ca479b7f91041a5c77c1cea61db197e493be86c95e81410892ea4dbd6e666b8c7d3cf10e953ed901945842ef6e336a2195a223e675b9dd3ab965189a14578 +DIST gcc-12.3-RC-20230505.tar.xz 85584972 BLAKE2B edd2da8ce615e843ebd47b09b1868b548c43afbef5e480678a2e1bda2a2e51150a67f8de0bedf26aaeb9a95baebe53d598faac37b0e7fca1bd83c5ba3c1c3d8e SHA512 01ddf5c6b4927fca7e5588617f84f37b844ea603e6efac0a98313c4d2a9024a15b953372ddb2759eb25afd9e1e4d6d6f018e29c164138f0ce25a9b59dc149693 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1 DIST gcc-13-20230429.tar.xz 83944828 BLAKE2B e939826a8ed126ff5543da048ba0071cca8e2b2a77335f6ee506debd0868269a3aa299ab695f1419eb84b472d406736b293ac2495901f82765e445102df3e03b SHA512 48095ff181f7389bda249dcd67c3c0369dd8fbe4741a8ab00833c0f5d569be165db28c369f65960650812a6011dda21692cca806f4c3261773b28d702e9f0c53 @@ -35,7 +35,7 @@ EBUILD gcc-11.3.1_p20230427.ebuild 1334 BLAKE2B cb480f1ae20bc31900948f61f48a050e EBUILD gcc-11.3.1_p20230504.ebuild 1346 BLAKE2B 278dd8483ef6034566c4ae12f9dfde8aac418129742a5c54564ff44655272c463f1cd0c2effb80aeb478b9cb8e01ef3b9e5095a4aa8a58367b5471cb778c29df SHA512 bd6b229f3aceb94ab1b944b89af9db2f4ae76f3c5387cbb333d0b52b11cd39fb0d179efb932089512d9a845197d97d17dca8a77117943a1bbf70056dc0bdcc5b EBUILD gcc-11.4.9999.ebuild 1315 BLAKE2B 45a8f481e0c08e5274d1797e421431e898753fce22426a1b2a1f4fd23c4dd44bed5f15da4c67f1c108b25d8393683fef631f998b8b524aa0d356be04625c0562 SHA512 fc4d8913f2aeed856b123a4545655813fe20544d841feca5121f85291a2aec99c770d845b14ce936c2fb14b5b9b1cd85166190ec657528bcb1710c7b48385c16 EBUILD gcc-12.2.1_p20230428-r1.ebuild 1475 BLAKE2B 69112653719b589bd72fe454b963d050194a8dc3a665fc7317989368cf0ff4281ac2f8519d7fc46311a3f91528d2e0457485357e67ff72765d6cfe743f0b4a2c SHA512 2e771e67e1668bf90695cc42517f46518e445a4af6e7cb9c8532efea047a4174d40f18b256cc99beec2b5fe5abde4f1ea7cb3ad84f4491032036d6b53f941e91 -EBUILD gcc-12.2.1_p20230502.ebuild 1596 BLAKE2B b9e543580375513a19b2dfdc1a320cd1e367584f6d8c27cd082130b7918acba0e85f3d5c1eaf8a56504d864570f5e61f3d175d65ee788677cfc542ddf0cdcec5 SHA512 295a9c2c8744c7fe4261ff5151b746c1fc4b642b0e4d81e4284e2966c4f78a8ee523f26d26b4a4c7740fc58f82c858c2ebff27cfa3a5c37933836838ecb9792c +EBUILD gcc-12.2.1_p20230505.ebuild 1596 BLAKE2B b9e543580375513a19b2dfdc1a320cd1e367584f6d8c27cd082130b7918acba0e85f3d5c1eaf8a56504d864570f5e61f3d175d65ee788677cfc542ddf0cdcec5 SHA512 295a9c2c8744c7fe4261ff5151b746c1fc4b642b0e4d81e4284e2966c4f78a8ee523f26d26b4a4c7740fc58f82c858c2ebff27cfa3a5c37933836838ecb9792c EBUILD gcc-12.3.9999.ebuild 1593 BLAKE2B 8246fe30de8cf3d515b1c5c23eea470de257aecc452fcce47e72497b310c62893c39275db02245a12a258b06c4ddd695a8346c9b539efca2a8e1d64aab0a8955 SHA512 a0fa5d4f5e6d1545e13d33b6fa45709f7dc5fccf026d060eef26752d7000c21b913276609abb6b174b2d04e08de3c61f8c4b126acbb196c767a8886ab7999ebb EBUILD gcc-13.1.0-r1.ebuild 1664 BLAKE2B b6fd223eeee8e6b0b02a5d5eb33437b1ba036bdf09a13aaab95318682f83d8dd1a184eb6afd8bef2c34013bfd8d0f38a108f3db0d6fbfd565f29d363cba98d3f SHA512 7e8eb3791678e456bf2c7717a4b8c95322efcde8dc3030f035cb9577fbc416a2c8b567e588036f94bffa2dd83bd00ee98a797d50d65388a3fc022819e4ab2c2e EBUILD gcc-13.1.1_p20230429-r1.ebuild 1725 BLAKE2B 622cdbd78b7911e7d65a55ab2c307f8112a95d822b05da74f090468d37dd1f8b68de52622a002f7692c9c4e756a0ba3e8ee42c6c5e60744404c18436526d07b6 SHA512 d0c5f9a9280ad891faa7a81833608ab8b5b3de507d2e4386c760496757b10d38db1acb36edad45f6bf0feb472a6503d7fbbbe82e9620e9ce6d7a6e35ce0ab78f diff --git a/sys-devel/gcc/gcc-12.2.1_p20230502.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230502.ebuild deleted file mode 100644 index 7c12fd4637c9..000000000000 --- a/sys-devel/gcc/gcc-12.2.1_p20230502.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -TOOLCHAIN_GCC_RC=1 -PATCH_VER="2" -PATCH_GCC_VER="12.3.0" -MUSL_VER="1" -MUSL_GCC_VER="12.3.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - # Sometimes the RCs are e.g. 12.3 and not 12.3.0... - #MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" -#fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - toolchain_src_prepare - - eapply_user -} diff --git a/sys-devel/gcc/gcc-12.2.1_p20230505.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230505.ebuild new file mode 100644 index 000000000000..7c12fd4637c9 --- /dev/null +++ b/sys-devel/gcc/gcc-12.2.1_p20230505.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +TOOLCHAIN_GCC_RC=1 +PATCH_VER="2" +PATCH_GCC_VER="12.3.0" +MUSL_VER="1" +MUSL_GCC_VER="12.3.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + # Sometimes the RCs are e.g. 12.3 and not 12.3.0... + #MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain + +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" +#fi + +if [[ ${CATEGORY} != cross-* ]] ; then + # Technically only if USE=hardened *too* right now, but no point in complicating it further. + # If GCC is enabling CET by default, we need glibc to be built with support for it. + # bug #830454 + RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" + DEPEND="${RDEPEND}" + BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" +fi + +src_prepare() { + toolchain_src_prepare + + eapply_user +} diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest index 641cef14819f..54dfbecad42f 100644 --- a/sys-devel/slibtool/Manifest +++ b/sys-devel/slibtool/Manifest @@ -1,5 +1,5 @@ DIST slibtool-0.5.34.tar.xz 79720 BLAKE2B 3a692d7485dcf2277f7ed99fe1ad67cf5fd33d8fe0a527d64634b0e7f956a5f58b92d812396f00d872ceb8509e058ae1a026f16a65feb2e79a9fff7bd60290da SHA512 3f7f6e4f45c4c2ae5ba5533152f08269cd77ca6fa2f3a515802bc23c7ac505b2d7340098fa98962c79035129cfd4077205596309f4acd1d634b9a1d6e2c0e96c DIST slibtool-0.5.34.tar.xz.sig 833 BLAKE2B 52df017d8ae3056e259a5283b0a4cea119a5ab4ce95e6c894d0d2e98fc10db101039a57c9a2a771f677c9d0afaad9273095ebdb078fca146a3d67ea25e9261fb SHA512 9f8415431a0b43e7be9a808dd6ed138a9b34b7b2c4af3ab406bdbc456ec31c877f13bc0b056ab9a50bec0b0cf1b654a133085f8523e70c8cb7d3851652d34ff7 -EBUILD slibtool-0.5.34.ebuild 1032 BLAKE2B b774190955b2fe739f6693462414078895346ebb1f3bf7c06ca079e20f78c48640dd1da0702653c9212ed3657ba166a8db4597b9c46602e54f1579c5059558eb SHA512 fbf85d8b5668e037a75c2825428d4fffc97d31a3f7f265a1b04707536f938660551fbbc37a9c4e598b62a963be7ccda438b06a62f24cc79c95c038e27c050749 -EBUILD slibtool-9999.ebuild 1000 BLAKE2B 59162ce0c19966b44861bc5b28410335023396842bf36414c49479555156a2f5ac38369fa2b2e65ab49a79fd97fc2d1b9a09284ea5068cdcb6e51de28d5f202e SHA512 88db8130fcafb92a7f87e25cb5b74c55f2a0b322ce68300814b9f7c51c032dfb07cd60b9094a01615b845bc3073b1b6a3ce395b2686093dcccabca7b7f61a26c +EBUILD slibtool-0.5.34.ebuild 1079 BLAKE2B 119665787b3ab0ccca1293aabc4e16dcf734c2c762e01a441949f3e4c29f942d91347e2f1128d10c16e7e14a5da3ae60455d8c0191cf85ffb649b41a77f4813e SHA512 f8c949361ca2a934c575e418d49a26210ba44730c48cfd2c6cdc784ea410bfd018e40c08e94840af10a9ebdd8b028f9f743b67dbfeaba116bad380fe27fe6b59 +EBUILD slibtool-9999.ebuild 1047 BLAKE2B 8384c38f5f816834f443ede523d55d8dfe9d580fd771bb0c115aa37d46613843c4f0085500b44aba32fef8fa121eea0b79403ec6a25657955ba031ef7146cfac SHA512 5055c1d6f16ac9637366c1ba9bdfb527645c10bf9ffc1ce2b4797d4418ca804a179f0436cab7dec495864775e7b90dcb62b5c3ed3fa8c48cc3596b2dbfaba154 MISC metadata.xml 496 BLAKE2B 8ee62c41383efeccd6d577cb031630f935810e45dd3887c93482b1880d03bf87a252f7a18ba3708b0b0521e2e2e0380d6871721672802189550173a1fe89229b SHA512 d707829a4daf977fb19facd83e5f1582ff422141e0c754867218edf9bc36b208c3ddc5d66159857609128c13a1ac3b51d497e5b89ab6cb0431e25cb7a43d48a5 diff --git a/sys-devel/slibtool/slibtool-0.5.34.ebuild b/sys-devel/slibtool/slibtool-0.5.34.ebuild index c176e886d89c..747b80b4a308 100644 --- a/sys-devel/slibtool/slibtool-0.5.34.ebuild +++ b/sys-devel/slibtool/slibtool-0.5.34.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -32,6 +32,7 @@ src_configure() { --compiler="$(tc-getCC)" \ --host=${CHOST} \ --prefix="${EPREFIX}"/usr \ - --libdir="$(get_libdir)" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shell="${EPREFIX}"/bin/sh \ || die } diff --git a/sys-devel/slibtool/slibtool-9999.ebuild b/sys-devel/slibtool/slibtool-9999.ebuild index 200a19a514d4..5295be737954 100644 --- a/sys-devel/slibtool/slibtool-9999.ebuild +++ b/sys-devel/slibtool/slibtool-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -32,6 +32,7 @@ src_configure() { --compiler="$(tc-getCC)" \ --host=${CHOST} \ --prefix="${EPREFIX}"/usr \ - --libdir="$(get_libdir)" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shell="${EPREFIX}"/bin/sh \ || die } -- cgit v1.2.3