diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-18 23:03:55 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-18 23:03:55 +0000 |
| commit | 27c70e310754920da519d34b7969d017e7740fb1 (patch) | |
| tree | 3d48b014b0777504b9c4e0fa84f80f2aeffb5830 | |
| parent | 2024-08-18 22:33:57 UTC (diff) | |
| parent | dev-debug/dtrace: add link to upstream bug re _F_S (diff) | |
| download | gentoo-27c70e310754920da519d34b7969d017e7740fb1.tar.gz gentoo-27c70e310754920da519d34b7969d017e7740fb1.tar.bz2 gentoo-27c70e310754920da519d34b7969d017e7740fb1.zip | |
Merge updates from master
| -rw-r--r-- | dev-debug/dtrace/dtrace-9999.ebuild | 3 | ||||
| -rw-r--r-- | sys-devel/gcc/Manifest | 1 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-15.0.0_pre20240818.ebuild | 52 |
3 files changed, 54 insertions, 2 deletions
diff --git a/dev-debug/dtrace/dtrace-9999.ebuild b/dev-debug/dtrace/dtrace-9999.ebuild index 15e7ca0357a0..73afc981b1fd 100644 --- a/dev-debug/dtrace/dtrace-9999.ebuild +++ b/dev-debug/dtrace/dtrace-9999.ebuild @@ -94,8 +94,7 @@ src_configure() { tc-export CC - # TODO: Can drop once https://lore.kernel.org/dtrace/20240425164057.420580-1-nick.alcock@oracle.com/ is in - # XXX: That wasn't enough, need to report upstream the other issues during build + # https://github.com/oracle/dtrace-utils/issues/78 tc-enables-fortify-source && append-cppflags -U_FORTIFY_SOURCE # lld does this by default, so fix that, although lld fails anyway... diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index cb50b0d8d66c..b37e2d0b1c7c 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -47,6 +47,7 @@ DIST gcc-15-20240721.tar.xz 88534600 BLAKE2B c057709e193fafa22cc753805e48cf092e0 DIST gcc-15-20240728.tar.xz 88642832 BLAKE2B 388c921b90ff71c0aa3313479bef9c39e53ba4a4b772ef21975c60451fe9beb7d49cb8ff9c3b14aace2976b528bf70e98c6af71c1cd9f6d6c8c8a4820159a6de SHA512 a8ae49eb8a831e0e3fd01b6933318a7c44002cc3cf8b3b157b39ea9a3db933b5feed183ead02181425540294c08d5e36a7bf1e012011fe1b9289f3cb03e75811 DIST gcc-15-20240804.tar.xz 89247584 BLAKE2B b49c828234a0b4cb35b0dcb7c2bfdc8d7c3d311f86f3db0acaefa81e57c3537d1ba9d32cd7fe2c7c53e2a019644fe2893aa9f69fa34c8c7af9053ba5c675ac26 SHA512 3db9bedd42fab2022532490acb7f3931976e500b7c4a3e93c226b68b7df0228d8489b80268273c9216c4bda12991bb07339c646982499761a39ba3fa54b45f29 DIST gcc-15-20240811.tar.xz 89363444 BLAKE2B eaa29844fe0fb62f3772904a5e2598541dcc78959006400f7fca5663f0ee3b6452e4aa77d46e627182b827da0a4e0e57b659db7a2a23f63219cf75785b73b3c9 SHA512 a8e169ba90168a481ea865f340b6f165dc538022b0ac814f43b80fca33eb7772001f6dd22fcb8a3f056cfacd023a21581bec5da71626860fcbc858ad573d5c39 +DIST gcc-15-20240818.tar.xz 89483300 BLAKE2B 5b92220899eeeb41ad1412c9c076c21cae9ecab2aee6717126e30716355469386adbf3b867bdda542d36b245034d30236b5aa316bd47484013ee4078cb02c896 SHA512 b6fced64a433820ea542f82214362106d2ebf986324351c5282ff6b316178446337e4c99cc59e7078a2361948304e361661790e789234a25e876e68459d901bf DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de DIST gcc-15.0.0-patches-4.tar.xz 11440 BLAKE2B 8b7379f91ac14dd1e496de744d221cb0ba1802c14ce32cb90e6311ca7a60cbaf488a57060673e2e9d407eed6d3c5b092c1ba6da27036d35e0c78a7ac8a5f5ec4 SHA512 92e8895ec1c6054b46581867f3e49bd2d574043ae82ca441e2b48d9ed0e2dd5c58baa53ba605ce59a5c1d59473ac0d79c0287e5b47d06f0a661c655a19a4a5df DIST gcc-15.0.0-patches-5.tar.xz 11840 BLAKE2B 9af335f7e1795e600eae742ac32f5ff737f157aaa35902227ba29b28013c95bcf5b2b1345a21c433bc10f4cfbfc267a595b6ca90ec2723f7f24fccac3f7c0355 SHA512 8cc8ec574640470780711bb5f6163f382c23999152c229d86e1143e03275a3147bd1fc0cd9bf3642a2402333ec565d30b90a6e367284b78ccc580c6721aeac23 diff --git a/sys-devel/gcc/gcc-15.0.0_pre20240818.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240818.ebuild new file mode 100644 index 000000000000..42d11e2113e4 --- /dev/null +++ b/sys-devel/gcc/gcc-15.0.0_pre20240818.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="15.0.0" +PATCH_VER="9" +MUSL_VER="2" +MUSL_GCC_VER="15.0.0" +PYTHON_COMPAT=( python3_{10..12} ) + +if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 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 + +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=master +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #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}" +fi + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} |