From d021944e8a7cb31d33e4e3226cbccc005bf632d2 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 12 Apr 2026 05:48:53 +0100 Subject: [PATCH] sys-devel/bpf-toolchain: drop 15.2.0_p1, 15.2.0_p2 Signed-off-by: Sam James --- sys-devel/bpf-toolchain/Manifest | 2 - .../bpf-toolchain-15.2.0_p1.ebuild | 232 ----------------- .../bpf-toolchain-15.2.0_p2.ebuild | 235 ------------------ 3 files changed, 469 deletions(-) delete mode 100644 sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p1.ebuild delete mode 100644 sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p2.ebuild diff --git a/sys-devel/bpf-toolchain/Manifest b/sys-devel/bpf-toolchain/Manifest index ef652cc8ed2ce..25b7391c824a0 100644 --- a/sys-devel/bpf-toolchain/Manifest +++ b/sys-devel/bpf-toolchain/Manifest @@ -1,4 +1,2 @@ -DIST binutils-2.45.1.tar.xz 27962312 BLAKE2B 1ccab38659ec47f9100b61322627345fe79ebd04ed0b1e872c988edded4d292d7c9ac33d9f6ea47bf265ec823dfba60da0e84374900c15ec89e3aa9280ac020c SHA512 ea030419eba387579ab717be7e3223fc99e93b586860b06003c12489f93441640d4082736f76aa5e98233db4f46e232f536a45e471486de1f5b64e1b827c167e -DIST binutils-2.45.tar.xz 27868232 BLAKE2B 1ce72346b1f531c89feb86b407e2c649151b506ffbd1a02d413411d36f7ede98fa9a1adf75dd941c01df5fe7e6bf151828b269eeb7c278315ca8004bff22eb7f SHA512 c7b10a7466d9fd398d7a0b3f2a43318432668d714f2ec70069a31bdc93c86d28e0fe83792195727167743707fbae45337c0873a0786416db53bbf22860c16ce7 DIST binutils-2.46.0.tar.xz 28548776 BLAKE2B 9f4fd8897d237eb5003bdf439537dfc5f8c681e9ff939fb06bb8235ed298031ea4cc91611edb640ffc432199d5791289d003fe0d07acce80327dc40595a5eb9e SHA512 32f880bb4f69351f4ae54a5d00359625c6c49d8e76624fb5cffdf174c79c8d3212f66225b81c12933c6ed59604ab652560773dd92fab384b930c97a9d4e1fdf2 DIST gcc-15.2.0.tar.xz 101056276 BLAKE2B e270320978ca690e6e8f5ef06414dc13caf561f16403a3783c76fbf3dcee57e755a2d5bba922bf7fcae0bb6120443755d819b003791ae823d54589dd799804de SHA512 89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de diff --git a/sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p1.ebuild b/sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p1.ebuild deleted file mode 100644 index 8bd88eb89c155..0000000000000 --- a/sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p1.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -# Versioning is just the GCC version in full (so may include a snapshot -# date). Unlike dev-util/mingw64-toolchain, which this ebuild was heavily -# inspired by, there's no "third component" here to version on, just -# GCC + binutils. -# -# Do _p1++ rather than revbump on Binutils changes -# Not using Gentoo patchsets for simplicity, their changes are mostly unneeded here. -GCC_PV=${PV%_p*} -BINUTILS_PV=2.45 - -DESCRIPTION="All-in-one bpf toolchain for building DTrace and systemd without crossdev" -HOMEPAGE=" - https://gcc.gnu.org/ - https://sourceware.org/binutils/ - https://gcc.gnu.org/wiki/BPFBackEnd -" -SRC_URI=" - mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz -" -if [[ ${GCC_PV} == *-* ]]; then - SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz" -else - SRC_URI+=" - mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz - mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz - " -fi -S="${WORKDIR}" - -# l1:binutils+gcc, l2:gcc(libraries) -LICENSE=" - GPL-3+ - LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) -" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="+bin-symlinks custom-cflags +strip" - -RDEPEND=" - dev-libs/gmp:= - dev-libs/mpc:= - dev-libs/mpfr:= - virtual/zlib:= - virtual/libiconv - bin-symlinks? ( - !cross-bpf-unknown-none/binutils - !cross-bpf-unknown-none/gcc - ) -" -DEPEND="${RDEPEND}" - -PATCHES=() - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - tc-is-cross-compiler && - die "cross-compilation of the toolchain itself is unsupported" -} - -src_prepare() { - # rename directories to simplify both patching and the ebuild - mv binutils{-${BINUTILS_PV},} || die - mv gcc{-${GCC_PV},} || die - - default -} - -src_compile() { - # src_compile is kept similar to dev-util/mingw64-toolchain - # at least for now for ease of comparison etc. - # - # not great but do everything in src_compile given bootstrapping - # process needs to be done in steps of configure+compile+install - # (done modular to have most package-specific things in one place) - - CTARGET=bpf-unknown-none - - BPFT_D=${T}/root # moved to ${D} in src_install - local bpftdir=/usr/lib/${PN} - local prefix=${EPREFIX}${bpftdir} - local sysroot=${BPFT_D}${prefix} - local -x PATH=${sysroot}/bin:${PATH} - - use custom-cflags || strip-flags # fancy flags are not realistic here - - # global configure flags - local conf=( - --build=${CBUILD:-${CHOST}} - --target=${CTARGET} - --{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs - MAKEINFO=: #922230 - ) - - # binutils - local conf_binutils=( - --prefix="${prefix}" - --host=${CHOST} - --disable-cet - --disable-default-execstack - --disable-nls - --disable-shared - --with-system-zlib - --without-debuginfod - --without-msgpack - --without-zstd - ) - - # gcc (minimal -- if need more, disable only in stage1 / enable in stage3) - local conf_gcc=( - --prefix="${prefix}" - --host=${CHOST} - --disable-bootstrap - --disable-cc1 - --disable-cet - --disable-gcov #843989 - --disable-gomp - --disable-nls # filename collisions - --disable-libcc1 - --disable-libquadmath - --disable-libsanitizer - --disable-libssp - --disable-libvtv - --disable-shared - --disable-werror - --enable-languages=c - --with-gcc-major-version-only - --with-system-zlib - --without-isl - --without-zstd - --disable-multilib - ) - - # libstdc++ may misdetect sys/sdt.h on systemtap-enabled system and fail - # (not passed in conf_gcc above given it is lost in sub-configure calls) - local -x glibcxx_cv_sys_sdt_h=no - - # bpft-build - # -> ./configure && make && make install && bpft-package() - # passes conf and conf_package to configure, and users can add options - # through environment with e.g. - # BPFT_BINUTILS_CONF="--some-option" - # EXTRA_ECONF="--global-option" (generic naming for if not reading this) - bpft-build() { - local id=${1##*/} - local build_dir=${WORKDIR}/${1}-build - - # econf is not allowed in src_compile and its defaults are - # mostly unused here, so use configure directly - local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" ) - - local -n conf_id=conf_${id} - [[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" ) - - local -n extra_id=BPFT_${id^^}_CONF - conf+=( ${EXTRA_ECONF} ${extra_id} ) - - einfo "Building ${id} in ${build_dir} ..." - - mkdir -p "${build_dir}" || die - pushd "${build_dir}" >/dev/null || die - - edo "${conf[@]}" - emake MAKEINFO=: V=1 - # -j1 to match bug #906155, other packages may be fragile too - emake -j1 MAKEINFO=: V=1 DESTDIR="${BPFT_D}" install - - declare -f bpft-${id} >/dev/null && edo bpft-${id} - - popd >/dev/null || die - } - - # build with same ordering that crossdev would do - bpft-build binutils - bpft-build gcc - - if use bin-symlinks; then - mkdir -p -- "${BPFT_D}${EPREFIX}"/usr/bin/ || die - local bin - for bin in "${sysroot}"/bin/*; do - ln -rs -- "${bin}" "${BPFT_D}${EPREFIX}"/usr/bin/ || die - done - fi - - # Delete libdep.a, which has a colliding name and is useless for bpf, - # which does not make use of cross-library dependencies: the libdep.a - # for the native binutils will do. - rm -f ${sysroot}/lib/bfd-plugins/libdep.a || die - - # portage doesn't know the right strip executable to use for CTARGET - # and it can lead to .a mangling, notably with 32bit (breaks toolchain) - dostrip -x ${bpftdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}} - - # TODO: Check if this is worth doing, it may not be - if use strip; then - einfo "Stripping ${CTARGET} static libraries ..." - find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \ - -exec ${CTARGET}-strip --strip-unneeded {} + || die - fi -} - -src_install() { - mv "${BPFT_D}${EPREFIX}"/* "${ED}" || die - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] && - eselect compiler-shadow update all - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "Note that this package is primarily intended for DTrace, systemd, and related" - elog "packages to depend on without needing a manual crossdev setup." - elog - elog "Settings are oriented only for what these need and simplicity." - elog "Use sys-devel/crossdev if need full toolchain/customization:" - elog " https://wiki.gentoo.org/wiki/Crossdev" - fi -} - -pkg_postrm() { - use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] && - eselect compiler-shadow clean all -} diff --git a/sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p2.ebuild b/sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p2.ebuild deleted file mode 100644 index df9fa8db54fde..0000000000000 --- a/sys-devel/bpf-toolchain/bpf-toolchain-15.2.0_p2.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 2022-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -# Versioning is just the GCC version in full (so may include a snapshot -# date). Unlike dev-util/mingw64-toolchain, which this ebuild was heavily -# inspired by, there's no "third component" here to version on, just -# GCC + binutils. -# -# Do _p1++ rather than revbump on Binutils changes -# Not using Gentoo patchsets for simplicity, their changes are mostly unneeded here. -GCC_PV=${PV%_p*} -BINUTILS_PV=2.45.1 - -DESCRIPTION="All-in-one bpf toolchain for building DTrace and systemd without crossdev" -HOMEPAGE=" - https://gcc.gnu.org/ - https://sourceware.org/binutils/ - https://gcc.gnu.org/wiki/BPFBackEnd -" -SRC_URI=" - mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz -" -if [[ ${GCC_PV} == *-* ]]; then - SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz" -else - SRC_URI+=" - mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz - mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz - " -fi -S="${WORKDIR}" - -# l1:binutils+gcc, l2:gcc(libraries) -LICENSE=" - GPL-3+ - LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) -" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="+bin-symlinks custom-cflags +strip" - -RDEPEND=" - dev-libs/gmp:= - dev-libs/mpc:= - dev-libs/mpfr:= - virtual/zlib:= - virtual/libiconv - bin-symlinks? ( - !cross-bpf-unknown-none/binutils - !cross-bpf-unknown-none/gcc - ) -" -DEPEND="${RDEPEND}" - -PATCHES=() - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - tc-is-cross-compiler && - die "cross-compilation of the toolchain itself is unsupported" -} - -src_prepare() { - # rename directories to simplify both patching and the ebuild - mv binutils{-${BINUTILS_PV},} || die - mv gcc{-${GCC_PV},} || die - - default -} - -src_compile() { - # src_compile is kept similar to dev-util/mingw64-toolchain - # at least for now for ease of comparison etc. - # - # not great but do everything in src_compile given bootstrapping - # process needs to be done in steps of configure+compile+install - # (done modular to have most package-specific things in one place) - - CTARGET=bpf-unknown-none - - BPFT_D=${T}/root # moved to ${D} in src_install - local bpftdir=/usr/lib/${PN} - local prefix=${EPREFIX}${bpftdir} - local sysroot=${BPFT_D}${prefix} - local -x PATH=${sysroot}/bin:${PATH} - - use custom-cflags || strip-flags # fancy flags are not realistic here - - # global configure flags - local conf=( - --build=${CBUILD:-${CHOST}} - --target=${CTARGET} - --{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs - MAKEINFO=: #922230 - ) - - # binutils - local conf_binutils=( - --prefix="${prefix}" - --host=${CHOST} - --disable-cet - --disable-default-execstack - --disable-nls - --disable-shared - --with-system-zlib - --without-debuginfod - --without-msgpack - --without-zstd - ) - - # gcc (minimal -- if need more, disable only in stage1 / enable in stage3) - local conf_gcc=( - --prefix="${prefix}" - --host=${CHOST} - --disable-bootstrap - --disable-cc1 - --disable-cet - --disable-gcov #843989 - --disable-gomp - --disable-nls # filename collisions - --disable-libcc1 - --disable-libquadmath - --disable-libsanitizer - --disable-libssp - --disable-libvtv - --disable-shared - --disable-werror - --enable-languages=c - --with-gcc-major-version-only - --with-system-zlib - --without-isl - --without-zstd - --disable-multilib - - # TODO: can likely remove this when bump to >=gcc-15.3 (bug #967042) - CXX="$(tc-getCXX) -std=c++14" - ) - - # libstdc++ may misdetect sys/sdt.h on systemtap-enabled system and fail - # (not passed in conf_gcc above given it is lost in sub-configure calls) - local -x glibcxx_cv_sys_sdt_h=no - - # bpft-build - # -> ./configure && make && make install && bpft-package() - # passes conf and conf_package to configure, and users can add options - # through environment with e.g. - # BPFT_BINUTILS_CONF="--some-option" - # EXTRA_ECONF="--global-option" (generic naming for if not reading this) - bpft-build() { - local id=${1##*/} - local build_dir=${WORKDIR}/${1}-build - - # econf is not allowed in src_compile and its defaults are - # mostly unused here, so use configure directly - local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" ) - - local -n conf_id=conf_${id} - [[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" ) - - local -n extra_id=BPFT_${id^^}_CONF - conf+=( ${EXTRA_ECONF} ${extra_id} ) - - einfo "Building ${id} in ${build_dir} ..." - - mkdir -p "${build_dir}" || die - pushd "${build_dir}" >/dev/null || die - - edo "${conf[@]}" - emake MAKEINFO=: V=1 - # -j1 to match bug #906155, other packages may be fragile too - emake -j1 MAKEINFO=: V=1 DESTDIR="${BPFT_D}" install - - declare -f bpft-${id} >/dev/null && edo bpft-${id} - - popd >/dev/null || die - } - - # build with same ordering that crossdev would do - bpft-build binutils - bpft-build gcc - - if use bin-symlinks; then - mkdir -p -- "${BPFT_D}${EPREFIX}"/usr/bin/ || die - local bin - for bin in "${sysroot}"/bin/*; do - ln -rs -- "${bin}" "${BPFT_D}${EPREFIX}"/usr/bin/ || die - done - fi - - # Delete libdep.a, which has a colliding name and is useless for bpf, - # which does not make use of cross-library dependencies: the libdep.a - # for the native binutils will do. - rm -f ${sysroot}/lib/bfd-plugins/libdep.a || die - - # portage doesn't know the right strip executable to use for CTARGET - # and it can lead to .a mangling, notably with 32bit (breaks toolchain) - dostrip -x ${bpftdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}} - - # TODO: Check if this is worth doing, it may not be - if use strip; then - einfo "Stripping ${CTARGET} static libraries ..." - find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \ - -exec ${CTARGET}-strip --strip-unneeded {} + || die - fi -} - -src_install() { - mv "${BPFT_D}${EPREFIX}"/* "${ED}" || die - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] && - eselect compiler-shadow update all - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "Note that this package is primarily intended for DTrace, systemd, and related" - elog "packages to depend on without needing a manual crossdev setup." - elog - elog "Settings are oriented only for what these need and simplicity." - elog "Use sys-devel/crossdev if need full toolchain/customization:" - elog " https://wiki.gentoo.org/wiki/Crossdev" - fi -} - -pkg_postrm() { - use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] && - eselect compiler-shadow clean all -}