From b818f6a820dceae80d6e3faac5fdf7be0c6fcbe2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Aug 2024 14:56:14 +0100 Subject: gentoo auto-resync : 23:08:2024 - 14:56:14 --- sys-devel/Manifest.gz | Bin 7862 -> 7864 bytes sys-devel/binutils-hppa64/Manifest | 2 + .../binutils-hppa64/binutils-hppa64-2.43-r1.ebuild | 534 +++++++++++++++++++++ sys-devel/binutils/Manifest | 2 +- sys-devel/binutils/binutils-2.43-r1.ebuild | 2 +- sys-devel/bpf-toolchain/Manifest | 2 +- .../bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild | 2 +- sys-devel/gcc/Manifest | 2 + sys-devel/gcc/gcc-12.4.1_p20240822.ebuild | 64 +++ 9 files changed, 606 insertions(+), 4 deletions(-) create mode 100644 sys-devel/binutils-hppa64/binutils-hppa64-2.43-r1.ebuild create mode 100644 sys-devel/gcc/gcc-12.4.1_p20240822.ebuild (limited to 'sys-devel') diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index 3363effd7156..b59c9a958c20 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest index a0d85f48fe33..9a19c7779d6b 100644 --- a/sys-devel/binutils-hppa64/Manifest +++ b/sys-devel/binutils-hppa64/Manifest @@ -12,6 +12,7 @@ DIST binutils-2.42-patches-3.tar.xz 34768 BLAKE2B e4bfaf3b42147408a8a3dcb00f5037 DIST binutils-2.42-patches-6.tar.xz 50664 BLAKE2B f13b65a761cfba80caf2e4740c6383b40305558365b950fba22aca95a104e799e8bd476082f36fb9288de4f224b09f317792c1444e549c40d15a4b64cdf61989 SHA512 1203eca0a9e622411eac377509de8fd0db3ffcb282ac38ab7a0369b166cc1091197daad85b51b145b34a4832f1a1a4d573c8254e8d67aeb22f35adb1ab3ece1f DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 DIST binutils-2.43-patches-1.tar.xz 11644 BLAKE2B 578ee67c3c5e67f9191a31a5c83ffcc781f757f8aaee3eea14d052db427cdd2bc769977dba16e9a8c653dcc4a94f11c149898683945d5035d0beeac128045b1a SHA512 e6db4eaf4fbea366e607a7e9a56e20851fcc34664532fd6aa1f0818271c3e2687eada3daca482e211a2b3e36be85e7e0b23158caaa0fdf9785d13a9156e8c734 +DIST binutils-2.43-patches-2.tar.xz 35184 BLAKE2B fa35c9f182c7ae0fed28614f47618d1563a58f223fd1805f348b618c1fbf039a444e44d88f46d040b6971e481e0da882e5c4492fd167d17bf39579d87a446434 SHA512 a7e167d3f6a2c08f19af4685d90a6160a1a52f1a87f5660fb6d80ec664033829c0eacad0d77b1306620e50ff89d1f9f63a7c2b064ad9775400f0cb0eba3159a4 DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb EBUILD binutils-hppa64-2.37_p1-r2.ebuild 12850 BLAKE2B 3359bbaab0af3be9e6cc5f84959caa5b3d57d0af838b7a952854051b647fa496bf7dc3b0582c5bbd518f55fc38bb06d3bdf67ea85f7c3af0d892993741cc3672 SHA512 5e9ff80f051dde6a7909b2d6827745b038d57ee0aeee7e1f5dbbbdb1f08941444a971d5296dc65b9341e02ca383b46f7bd484f68cee74bb1682de22cab7bd4d5 EBUILD binutils-hppa64-2.38-r2.ebuild 12858 BLAKE2B a91eea4d22fd3dc6c3d9010b256d006f3a832cb390ba9e387bfd4a5c4ceeb6fe8ad02624f50c957b2917b528451e31e2c4d5f048d12f78c1224ee71660f06b21 SHA512 b185556f88eff64c40a12fecee2f9d7f0873b9d59926cd853831d6d7a9b6f7fba71541ca0f93eb9919795041f5e2ff0049f855dda8537300e66e1bd687e8f446 @@ -20,5 +21,6 @@ EBUILD binutils-hppa64-2.40-r7.ebuild 13863 BLAKE2B 0e88fddae6ee0f05a7a34d60a878 EBUILD binutils-hppa64-2.41-r5.ebuild 14048 BLAKE2B 4290a888bb76e52e1e9f32e081934d2f39759bc4aaa2b750a465325f3a9068a257dda9a45c3aae0848c4120bc4df4692cce382acca265f042c0bb75783e80242 SHA512 56928ada7bd013904eae956667997492dfc707975632171a5124f66d6306308f03de6decfb36700adf0cc2759737527716eb9a919267304844c394468ffbb994 EBUILD binutils-hppa64-2.42-r1.ebuild 15050 BLAKE2B 012fdcedf5e30e8fe3efe783491bd08521d0c5493fc09ff69e63ceaba07c3e67b69e7abf0522de4585da5267fc9924e5c69a0382a37e2c035b9425eaeedbf267 SHA512 49de0dd639484578847a1bc27cd2f574ed91b85e9194a7dd7458f22deae4407ada606927c8b4d2f62c39b1f2f992baea93f7d8b99e68f2e3006d9fd2b9911914 EBUILD binutils-hppa64-2.42-r2.ebuild 15051 BLAKE2B 8f0727b2a38004f05b5498ff611f2afb6873e8efd9e7856ed164b9fa92c7339f3093d97c5a7a91b9fc5a86bd35a8e5bde06d8991a7f331af159387f536690d4a SHA512 94da14fe04f352ae8cc799c3babb5050805c1f265aa5aa6ca0330ce47ee17a3d44f112bf3052f1bb5eafc7e61d57b03b6bd7fdc7906e0ed6774b62c7463bbe33 +EBUILD binutils-hppa64-2.43-r1.ebuild 15051 BLAKE2B 4e4fbe505015299a78d0094c478fff36335a9649e1d72fb49ab70cd5484d040c86db957ff278fcff2880210c3cb77bdd5bed0696b4886710bb0dcfb5a7870d7c SHA512 7767ad7dfa5f2a62f0f24f93327a425284947311889c50c9eac6b4642cc89ea940ad7ac3897b987cc54f609be13c4accc8fd3ed03ecab5b88f25d5855d2d3c95 EBUILD binutils-hppa64-2.43.ebuild 15051 BLAKE2B 77a44bdb08b1bc582987a84cc40af473ab05a6f7f8b486c5c402e825bd49ba730eb8d92a5aee079f213e48e7eb310f9b356876894c040d881120a39f9ff5fb93 SHA512 438135a3a0b8477d333852d5d0269499f774dee8710fb5dc66871241d2c476dda8516206230b649df6a555b750a935fb7a55d97ba71ad82abc487fd0fb63426e MISC metadata.xml 1110 BLAKE2B 0a916aa36bbf2a81095732fc321d989c9ff369de43474ff98317530c19085d1f20f5934ede2caa5939e2b4dbd29c1d98ea35de1ad4056db396c72e75abf97aa9 SHA512 216d0df87f2eb99c79b9417ff295280a05c48757d4969b3a6a48a8dfbe4004a67511006b192680432f971ebb6e5950a2b0d20ce50415cb13123badbe9ece95d5 diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.43-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.43-r1.ebuild new file mode 100644 index 000000000000..a71d9243c9cc --- /dev/null +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.43-r1.ebuild @@ -0,0 +1,534 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CTARGET=hppa64-${CHOST#*-} + +inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="https://sourceware.org/binutils/" + +LICENSE="GPL-3+" +IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins static-libs test vanilla zstd" + +# Variables that can be set here (ignored for live ebuilds) +# PATCH_VER - the patchset version +# Default: empty, no patching +# PATCH_BINUTILS_VER - the binutils version in the patchset name +# - Default: PV +# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... +# for the patchsets + +PATCH_VER=2 +PATCH_DEV=dilfridge + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + SLOT=${PV} +else + PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} + PATCH_DEV=${PATCH_DEV:-dilfridge} + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz" + [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + SLOT=$(ver_cut 1-2) + KEYWORDS="-* ~hppa" +fi + +# +# The cross-compile logic +# +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +# +# The dependencies +# +RDEPEND=" + >=sys-devel/binutils-config-3 + sys-libs/zlib + debuginfod? ( + dev-libs/elfutils[debuginfod(-)] + ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( sys-apps/texinfo ) + test? ( + dev-util/dejagnu + app-alternatives/bc + ) + nls? ( sys-devel/gettext ) + zstd? ( virtual/pkgconfig ) + app-alternatives/lex + app-alternatives/yacc +" + +RESTRICT="!test? ( test )" + +MY_BUILDDIR="${WORKDIR}"/build +S="${WORKDIR}"/${P/-hppa64/} + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patch || die + + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + S=${WORKDIR}/binutils + EGIT_CHECKOUT_DIR=${S} + git-r3_src_unpack + else + unpack ${P/-hppa64/}.tar.xz + + cd "${WORKDIR}" || die + unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz + + # _p patch versions are Gentoo specific tarballs ... + local dir=${P%_p?} + dir=${dir/-hppa64/} + + S=${WORKDIR}/${dir} + fi + + cd "${WORKDIR}" || die + mkdir -p "${MY_BUILDDIR}" || die +} + +src_prepare() { + local patchsetname + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}" + fi + + if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then + if ! use vanilla; then + einfo "Applying binutils patchset ${patchsetname}" + eapply "${WORKDIR}/patch" + einfo "Done." + + # This is applied conditionally for now just out of caution. + # It should be okay on non-prefix systems though. See bug #892549. + if [[ ${PN} != binutils-hppa64 ]] && { is_cross || use prefix; } ; then + eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \ + "${FILESDIR}"/binutils-2.41-linker-prefix.patch + fi + fi + fi + + # Make sure our explicit libdir paths don't get clobbered, bug #562460 + sed -i \ + -e 's:@bfdlibdir@:@libdir@:g' \ + -e 's:@bfdincludedir@:@includedir@:g' \ + {bfd,opcodes}/Makefile.in || die + + # Apply things from PATCHES and user dirs + default + + # Run misc portage update scripts + gnuconfig_update + elibtoolize --portage --no-uclibc +} + +toolchain-binutils_bugurl() { + printf "https://bugs.gentoo.org/" +} +toolchain-binutils_pkgversion() { + printf "Gentoo ${PV}" + [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" +} + +src_configure() { + # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html + # Avoid really confusing logs from subconfigure spam, makes logs far + # more legible. + MAKEOPTS="--output-sync=line ${MAKEOPTS}" + + # Setup some paths + LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} + INCPATH=${LIBPATH}/include + DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} + if is_cross ; then + TOOLPATH=/usr/${CHOST}/${CTARGET} + else + TOOLPATH=/usr/${CTARGET} + fi + BINPATH=${TOOLPATH}/binutils-bin/${PV} + + # Make sure we filter $LINGUAS so that only ones that + # actually work make it through, bug #42033 + strip-linguas -u */po + + # Keep things sane + strip-flags + use cet && filter-flags -mindirect-branch -mindirect-branch=* + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR}" || die + local myconf=() + + if use plugins ; then + myconf+=( --enable-plugins ) + fi + # enable gold (installed as ld.gold) and ld's plugin architecture + if use gold ; then + myconf+=( --enable-gold ) + fi + + if use nls ; then + myconf+=( --without-included-gettext ) + else + myconf+=( --disable-nls ) + fi + + myconf+=( --with-system-zlib ) + + # For bi-arch systems, enable a 64bit bfd. This matches the bi-arch + # logic in toolchain.eclass. bug #446946 + # + # We used to do it for everyone, but it's slow on 32bit arches. bug #438522 + case $(tc-arch) in + ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; + esac + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + is_cross && myconf+=( + --with-sysroot="${EPREFIX}"/usr/${CTARGET} + --enable-poison-system-directories + ) + + myconf+=( --enable-secureplt ) + + # mips can't do hash-style=gnu ... + if [[ $(tc-arch) != mips ]] ; then + myconf+=( --enable-default-hash-style=gnu ) + fi + + myconf+=( + --prefix="${EPREFIX}"/usr + --host=${CHOST} + --target=${CTARGET} + --datadir="${EPREFIX}"${DATAPATH} + --datarootdir="${EPREFIX}"${DATAPATH} + --infodir="${EPREFIX}"${DATAPATH}/info + --mandir="${EPREFIX}"${DATAPATH}/man + --bindir="${EPREFIX}"${BINPATH} + --libdir="${EPREFIX}"${LIBPATH} + --libexecdir="${EPREFIX}"${LIBPATH} + --includedir="${EPREFIX}"${INCPATH} + # portage's econf() does not detect presence of --d-d-t + # because it greps only top-level ./configure. But not + # libiberty's or bfd's configure. + --disable-dependency-tracking + --disable-silent-rules + --enable-obsolete + --enable-shared + --enable-threads + --enable-relro + --enable-install-libiberty + --enable-textrel-check=$(usex hardened error warning) + # Things to think about + #--enable-deterministic-archives + --enable-new-dtags + --disable-jansson + --disable-werror + --with-bugurl="$(toolchain-binutils_bugurl)" + --with-pkgversion="$(toolchain-binutils_pkgversion)" + $(use_enable static-libs static) + $(use_with zstd) + + # Disable modules that are in a combined binutils/gdb tree, bug #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags: https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + # Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100 + --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st) + + $(use_with debuginfod) + + # Avoid automagic dev-libs/msgpack dep, bug #865875 + --without-msgpack + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) + + # We can enable this by default in future, but it's brand new + # in 2.39 with several bugs: + # - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477) + # - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521) + # - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479) + # - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113) + $(use_enable gprofng) + ) + + case ${CTARGET} in + x86_64-*|aarch64*|arm64*|i[3456]*) + # These hardening options are available from 2.39+ but + # they unconditionally enable the behaviour even on arches + # where e.g. execstacks can't be avoided. + # See https://sourceware.org/bugzilla/show_bug.cgi?id=29592. + # + # TODO: Get the logic for this fixed upstream so it doesn't + # create impossible broken combinations on some arches, like mips. + # + # TODO: Get the logic for this fixed upstream so --disable-* works + # as expected. + myconf+=( + --enable-warn-execstack=yes + --enable-warn-rwx-segments=yes + ) + + if use hardened ; then + myconf+=( + # TOOD: breaks glibc test suite + #--enable-error-execstack=yes + #--enable-error-rwx-segments=yes + --enable-default-execstack=no + ) + fi + ;; + *) + ;; + esac + + if use elibc_musl ; then + # Override our earlier setting for musl, as textrels don't + # work there at all. See bug #707660. + myconf+=( + --enable-textrel-check=error + ) + fi + + if ! is_cross ; then + # No LTO for HPPA64 right now as we don't build kgcc64 with LTO support. + myconf+=( $(use_enable pgo pgo-build) ) + + if use pgo ; then + export BUILD_CFLAGS="${CFLAGS}" + fi + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + # Prevent makeinfo from running if doc is unset. + if ! use doc ; then + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die + fi +} + +src_compile() { + cd "${MY_BUILDDIR}" || die + + # see Note [tooldir hack for ldscripts] + # see linker prefix patch + emake \ + tooldir="${EPREFIX}${TOOLPATH}" \ + gentoo_prefix=$(usex prefix-guest "${EPREFIX}"/usr /usr) \ + all + + # only build info pages if the user wants them + if use doc ; then + emake info + fi + + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 -delete +} + +src_test() { + cd "${MY_BUILDDIR}" || die + + # bug #637066 + filter-flags -Wall -Wreturn-type + + emake -k check +} + +src_install() { + local x d + + cd "${MY_BUILDDIR}" || die + + # see Note [tooldir hack for ldscripts] + emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install + rm -rf "${ED}"/${LIBPATH}/bin || die + use static-libs || find "${ED}" -name '*.la' -delete + + # Newer versions of binutils get fancy with ${LIBPATH}, bug #171905 + cd "${ED}"/${LIBPATH} || die + for d in ../* ; do + [[ ${d} == ../${PV} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${ED}"/${BINPATH} || die + for x in * ; do + mv ${x} ${x/${CTARGET}-} || die + done + + if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then + # No die for now, dies on hppa? + mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} + mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/usr/${CHOST}/{include,lib} + fi + fi + + insinto ${INCPATH} + local libiberty_headers=( + # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. + demangle.h + dyn-string.h + fibheap.h + hashtab.h + libiberty.h + objalloc.h + splay-tree.h + ) + doins "${libiberty_headers[@]/#/${S}/include/}" + if [[ -d ${ED}/${LIBPATH}/lib ]] ; then + # TODO: add || die here, fails on hppa? + mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/${LIBPATH}/lib + fi + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${PV}" + LIBPATH="${EPREFIX}${LIBPATH}" + EOF + newins "${T}"/env.d ${CTARGET}-${PV} + + # Handle documentation + if ! is_cross ; then + cd "${S}" || die + dodoc README + + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + + docinto opcodes + dodoc opcodes/ChangeLog* + fi + + # Remove shared info pages + rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + + docompress "${DATAPATH}"/{info,man} + + # Trim all empty dirs + find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null + + # the hppa64 hack; this should go into 9999 as a PN-conditional + # tweak the default fake list a little bit + cd "${D}"/etc/env.d/binutils + sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die +} + +pkg_postinst() { + # Make sure this ${CTARGET} has a binutils version selected + [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 + binutils-config ${CTARGET}-${PV} +} + +pkg_postrm() { + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then + binutils-config ${CTARGET}-${PV} + fi +} + +# Note [slotting support] +# ----------------------- +# Gentoo's layout for binutils files is non-standard as Gentoo +# supports slotted installation for binutils. Many tools +# still expect binutils to reside in known locations. +# binutils-config package restores symlinks into known locations, +# like: +# /usr/bin/${CTARGET}- +# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips +# /usr/include/ +# +# Note [tooldir hack for ldscripts] +# --------------------------------- +# Build system does not allow ./configure to tweak every location +# we need for slotting binutils hence all the shuffling in +# src_install(). This note is about SCRIPTDIR define handling. +# +# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value +# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' +# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. +# Thus we can't just move files around after compilation finished. +# +# Our goal is the following: +# - at build-time set scriptdir to point to symlinked location: +# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) +# - at install-time set scriptdir to point to slotted location: +# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest index c1c5719cd5ff..533e4d83b404 100644 --- a/sys-devel/binutils/Manifest +++ b/sys-devel/binutils/Manifest @@ -45,7 +45,7 @@ EBUILD binutils-2.40-r9.ebuild 14132 BLAKE2B ea7d8298ab644f3c4d1c2ca620949cef1f2 EBUILD binutils-2.41-r5.ebuild 14654 BLAKE2B 2049e8618a6aa4385bf036726a027cc2e58ce1e5e00d35d1d9926846f0209fcfe958d42e7ad4de6ea474bc8dd728c6f8d706121867e2c39e1404621deb15a1af SHA512 feeb65fc8ed360235fddc9d287d4aa28109ea60504283332940133eb40bcc0be5799a400c1da8aa7cf0e4038ebc8619ee225d6baf83ddc9f1d923c2ba2ded675 EBUILD binutils-2.42-r1.ebuild 15573 BLAKE2B 519d29431da4ea9c3d04e2e8baf923135d42042b8e1d06f57dfe58166fff618e2a790a64471d99ffd74a652114ce7382d5f546feb3e1484374f02e63a2f9d36b SHA512 9ef4b4df659786205130f0010407ff7955885fdbc09c696d85b62663e75b09dd01a7255b526fbb082c0c319d8f5603f6a46c7292a04e7f6f2394713d95386974 EBUILD binutils-2.42-r2.ebuild 15757 BLAKE2B c4ef7bd29af55cddbcb1d360f65c228866e4edfe32d6b1dbe6ca2198d3f9613a336bc2ca9a4432e6d8c9b556136ca294e797990b864b7cc53bd9dc55ea63e885 SHA512 4fd200c7603dfec62b69c5987a12e74697e028e22de07837b12d84d2b5a7a5fbad81caf25c768303044bb94d8a160affc2484eb3362473436cf3954bd29de7c6 -EBUILD binutils-2.43-r1.ebuild 15848 BLAKE2B 4c203f676ebd964fbecbacae27e54d1b8bda2751b3b9f7b291c810b52805b2925e22460270e47fdaa19503cf6205edc1721e5675902cdac32b969bcf12af4b29 SHA512 1e70aedd622558a0f5eb5ec3491b0bbd86993092cd6054379a66e7d26d42b8a6e915d02395c7ce083a9ae3f9ea486816a673c732e3640ab8a8c2fe5383c0a77c +EBUILD binutils-2.43-r1.ebuild 15854 BLAKE2B 79c648ecb61521ec2afbd5bf3b81c45da21564d729736d63ce777db7c2b2a26041641e43e218732a6f3dff84b9bb304ab7fc41361c6718bfe98bdbb4ebb6d814 SHA512 4d13091d35e82669849db3e3cc9167b8d49e16c249a1f0917bc8983aae2cbf75be6473a6e0c8d3d4197a59fba9d9b2d3dce731ca3ee0b958b7ece2bdee4d35ab EBUILD binutils-2.43.9999.ebuild 15855 BLAKE2B 6e456c981c1b007057d0e8a344bfb066c6690e04dc968bb83d5e50e4112a550ee94368bb73f72f8b39f196259fabff8ff79f97a9510d50479f6919ccb8f1522a SHA512 67d4a5eefa8d63b6170ac460a5a366f39afbc4c6788f4397f28a855e2db942603ce7f991ced1b1d60636f4876f89727851d3fd0843be69bde6fbe6c7f9a3b04c EBUILD binutils-2.43.ebuild 15847 BLAKE2B e863cfa9d5993fe3faed07818a541245718842fa7fab44c6269fcffedde99e1111f9d2058d77205efec4bebafd728e135b9d206049cf7bcfc3f75890a762971e SHA512 dd2524dd671f21b129be058eba1e7e9a41ceff5e552f1af8708b318d024fd28cec396a49420a5eb250cad02bc27178738743a42da2d4c9f9797ad1d778059e8f EBUILD binutils-9999.ebuild 15908 BLAKE2B 45b63d8abea50e1cc2abe1c94cf9d4ca7244ac59c7992c994df9b9bfae138b8be59b2b7380c83c5c89f778e15cccec5148ce08eefc7f6daa3ce7bbc3f8eea669 SHA512 8de6cdc2f925ad995664983f145ba1a14fdbaa32ec69d3f716ddbea87829a726650158fcef1621cfa526ba7b8cfbba601308f458ace46e4c1374dd00c799b457 diff --git a/sys-devel/binutils/binutils-2.43-r1.ebuild b/sys-devel/binutils/binutils-2.43-r1.ebuild index e09db32d1a07..ef196ce06291 100644 --- a/sys-devel/binutils/binutils-2.43-r1.ebuild +++ b/sys-devel/binutils/binutils-2.43-r1.ebuild @@ -35,7 +35,7 @@ else [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" SLOT=$(ver_cut 1-2) - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi # diff --git a/sys-devel/bpf-toolchain/Manifest b/sys-devel/bpf-toolchain/Manifest index 225dce824d46..781be6009421 100644 --- a/sys-devel/bpf-toolchain/Manifest +++ b/sys-devel/bpf-toolchain/Manifest @@ -2,5 +2,5 @@ DIST binutils-2.43.1.tar.xz 28174300 BLAKE2B c4cd765cea326cd00b5cfe306e2937d8206 DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb DIST gcc-14.2.0.tar.xz 92306460 BLAKE2B 87baf2a06dfa75d8fb6cd62c747ef1f57d3b9bbbe33a360d9ed3de4b4dbeaa8d920504c67e409bd9863414202c14fd854b46108e984418171205119216d03d3b SHA512 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396 EBUILD bpf-toolchain-14.2.0-r2.ebuild 6452 BLAKE2B 2ce7aa3cbe5c72659934616ca9bdb1d2ee394deddeb9f730d416e27a7a6a319dd55c173e603913085f988df1eae6dbe335fec74fb895a94b57364b94cc72ee16 SHA512 72c5a45e713899b1a26d05afd9b47b69425b4e05252365f91faf3fea9663169aabe28609773e05da82cc71d711f4ba7fec23272ef57b9600f39ece9ca322ed2e -EBUILD bpf-toolchain-14.2.0_p1.ebuild 6453 BLAKE2B ec76969f9ec5ea1fae06e1321204c76da4ca5967ea9035a78dd758b94b401533aefc5853a0abee317aea0544a193e9f6ba3a297443aed9207cad840a05d1e14f SHA512 a91ea44ba35cfc0fa82628e2f494084bdb1a28c41183c06f3ae559574abf881de22c34c8f9cd13807d8be1c5ca79e8ce1ea94c222f721b60c3430d01c7abfb51 +EBUILD bpf-toolchain-14.2.0_p1.ebuild 6458 BLAKE2B 9a40a9fa4e26c1383fc122802e5a501523ec4e3a15e1ec56c203c54ee39398946c937ed415245e15111f2bd324279af26660498661a20dcba62217681b19a501 SHA512 eaadfd4312e698e0928dc199186a337b6c3e6756e4c2147dab003bd157e392d3315c54469bd3c0abb7641438f1b52dd5ae545660248d40b2299c3fbaa3b0f8a3 MISC metadata.xml 599 BLAKE2B c41d219a2ba989105be860668dae9a75ed7283924017bc5f452853325f7800d90f87f3acd8c56c51efbc150a45d630f20dff2867a73753e4a71fef2cc5adea04 SHA512 c0e7d480106f9803602288191de6b5295d80c8f4da7458dd1630dcb40ea67cf0e1258865bd7be646306b60700c991ed15c487d54c083f2a65717ac46c27a70de diff --git a/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild b/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild index 847ea82ad412..00dbda329dee 100644 --- a/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild +++ b/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild @@ -40,7 +40,7 @@ LICENSE=" LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) " SLOT="0" -KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+bin-symlinks custom-cflags +strip" RDEPEND=" diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 6f25a16ad4db..f879e94b9130 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -14,6 +14,7 @@ DIST gcc-12-20240725.tar.xz 79899056 BLAKE2B 299edcf3a8fa35f15bcc850a5fd3be12c2d DIST gcc-12-20240801.tar.xz 79883084 BLAKE2B 9b50ef282b5d55b2c477e5edd83c70076e0fe81c533d15bb9e8a4ac2b53c855f2aac80774b6944e843c6433294fc1b6ff96d7f754c78f60623dc1068c5e0e844 SHA512 57699fe4749558e2116e38e6d3dd2427a790969789f7d510225a8306e601a5ef07ca0609ba948c79d540b52c51d29abadbb0195d66f709505d7b685fd11b3e1d DIST gcc-12-20240808.tar.xz 79911312 BLAKE2B a4958a9980e043d295df7ac75d4f0ac594b012e756133f20cc99a510d288f0be1b253e10c6ee08da36c881cce1bb545ce028ca2d65ba2e180672c09c377a9553 SHA512 ad57e71315ac4061b528a0ef6217298d545f7b48d1e73c9b543a7594c48bddf61098227aa0ad889aafb80f2532ce26d4a74b24a84c4cfa52e075415c0a512508 DIST gcc-12-20240815.tar.xz 79901552 BLAKE2B 5607c6e801b2defbd7f41d37c262e0fcf8562615c755fd34ddd91fdaf27811587e30ad8428a0fe6185f5a3d16382f40164a1f2be4eead5b9993514949afdb349 SHA512 68703cb8f3bb2f81c048bbe514e1e6669172ceea06ea4db02a3e97f6d51d9924d68898b0f4bdb6d383beb619e0e537bb57c9c4b3cd69fdb1e55173bb363af060 +DIST gcc-12-20240822.tar.xz 79887924 BLAKE2B 70312d8d2e474b67d60895eeeee82de151b2e3633435de53a6bc894ec96dc3cbc303a2676e2fddcd429f677ec25958d520807971bf1daa8df08c2f24e9f3de76 SHA512 d74ac04a3aa42c129e88dbbc47119a98e0c213bd36792f383a3716a6f55eaa09f97dfc4991656fed857acb975e427c1bcb443ed777833e3e3a08f18b405cb02f DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326 DIST gcc-12.3.0-patches-3.tar.xz 14852 BLAKE2B 7a5f1f43063b15f424099afd72096212fbbbc5151ff01f2de15dfb6e7cf274981c8cfaedba9ef61576c9096fb172fc550a7deb5cd7d9366fd249fd5dd3951f76 SHA512 aa89e4c2ae02f4fb42229ad5167f2eaa3a8fae51118645bf07199fe2124b9c83948590662b053d08002ef709fa870ea88315fd4ccbe4441a74e9cb62edcb82fb DIST gcc-12.4.0.tar.xz 83377372 BLAKE2B 0d5aa9995bf53fa2dc976a846240cfb8fafd125ad6c54f45dc9d770215eae3e9ea0db82a9a4f79c51b4d5f8461a1d730c17db6841bc31bd96dba11d9ed7544ae SHA512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 @@ -74,6 +75,7 @@ EBUILD gcc-12.4.1_p20240725.ebuild 1608 BLAKE2B 236a5a5573a0a0a6a1da316f33eca0e5 EBUILD gcc-12.4.1_p20240801.ebuild 1608 BLAKE2B 236a5a5573a0a0a6a1da316f33eca0e572201ef02a6de02831e26a832121cff91af62a7d6a58cae3cf56f7e925b89bdf76ee4e24a8d3e894612b00d662fbb513 SHA512 6a4aa46da76b1d2501fc5937d14658ac44efb5981b6d30ba25a88a84879e7a3a4d00370a541be4974bdb881b0c2238f61459dbe8f6295e32fdb391bd70a6e4d4 EBUILD gcc-12.4.1_p20240808.ebuild 1608 BLAKE2B 236a5a5573a0a0a6a1da316f33eca0e572201ef02a6de02831e26a832121cff91af62a7d6a58cae3cf56f7e925b89bdf76ee4e24a8d3e894612b00d662fbb513 SHA512 6a4aa46da76b1d2501fc5937d14658ac44efb5981b6d30ba25a88a84879e7a3a4d00370a541be4974bdb881b0c2238f61459dbe8f6295e32fdb391bd70a6e4d4 EBUILD gcc-12.4.1_p20240815.ebuild 1608 BLAKE2B 236a5a5573a0a0a6a1da316f33eca0e572201ef02a6de02831e26a832121cff91af62a7d6a58cae3cf56f7e925b89bdf76ee4e24a8d3e894612b00d662fbb513 SHA512 6a4aa46da76b1d2501fc5937d14658ac44efb5981b6d30ba25a88a84879e7a3a4d00370a541be4974bdb881b0c2238f61459dbe8f6295e32fdb391bd70a6e4d4 +EBUILD gcc-12.4.1_p20240822.ebuild 1608 BLAKE2B 236a5a5573a0a0a6a1da316f33eca0e572201ef02a6de02831e26a832121cff91af62a7d6a58cae3cf56f7e925b89bdf76ee4e24a8d3e894612b00d662fbb513 SHA512 6a4aa46da76b1d2501fc5937d14658ac44efb5981b6d30ba25a88a84879e7a3a4d00370a541be4974bdb881b0c2238f61459dbe8f6295e32fdb391bd70a6e4d4 EBUILD gcc-12.5.9999.ebuild 1576 BLAKE2B 130ad8310161a8edc11cee748b8ef25c01c6979250f60b75d5e937c644196447f3f14413530e616643321478d7925b17f3c1a3a721a6a237e79b1bbaef512c55 SHA512 a29e571fef4955a146e5ffe79596d24c8780bddf9af4fbb5ca2d18ca1fc17dd2a4a40a08c5eb7a6e15b77a2efb4352d6fd44972e62e7914d192e6ff48b555a77 EBUILD gcc-13.2.0.ebuild 1666 BLAKE2B fa7667d2e80c162e51091525ddb73bb4ced21bff0c797c0b5993742a4dd5764963f40c3d205fc674187d1cb7cd3ca32a1519ed2fb37450743356eb096d36e914 SHA512 4519c19ecf26ba9af0270c70fcc3360b595aaabf037717a17fe1e250962363902328756fab02705c7392207541fa262c3e7b3d4887d69dac3143a6a4f129b17d EBUILD gcc-13.2.1_p20240210.ebuild 1659 BLAKE2B da731616a58d94bf5d5c8dbe354ab411f093ef8630ea3f71b5c81f4ab5db977a755ec2e1ae29118d2fb39b2257e791c9e4363a9dd08eba10d0588cb8f29482a4 SHA512 f61ba946cbfae240ec59a5d61eb5f10409819cec75abb792a017a0452d7c8b19da810d437796cf47bb71c5d05c1a964ea40083d8946bf938008fb99e63d4a3b5 diff --git a/sys-devel/gcc/gcc-12.4.1_p20240822.ebuild b/sys-devel/gcc/gcc-12.4.1_p20240822.ebuild new file mode 100644 index 000000000000..e645c4d53b77 --- /dev/null +++ b/sys-devel/gcc/gcc-12.4.1_p20240822.ebuild @@ -0,0 +1,64 @@ +# 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="12.3.0" +PATCH_VER="3" +MUSL_VER="1" +MUSL_GCC_VER="12.3.0" +PYTHON_COMPAT=( python3_{10..12} ) + +if [[ ${PV} == *.9999 ]] ; then + MY_PV_2=$(ver_cut 2) + MY_PV_3=1 + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + MY_PV_3=0 + else + MY_PV_2=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} +elif [[ -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=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 +} -- cgit v1.2.3