From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B3A3159C9B for ; Wed, 31 Jul 2024 22:32:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C41EB2BC030; Wed, 31 Jul 2024 22:32:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A573D2BC030 for ; Wed, 31 Jul 2024 22:32:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 563723406BF for ; Wed, 31 Jul 2024 22:32:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E7231E82 for ; Wed, 31 Jul 2024 22:32:06 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1722465115.101b47b0d549927a2d36b7bec3be03ef6605cb50.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/binutils/binutils-2.43.9999.ebuild sys-devel/binutils/binutils-9999.ebuild X-VCS-Directories: sys-devel/binutils/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 101b47b0d549927a2d36b7bec3be03ef6605cb50 X-VCS-Branch: master Date: Wed, 31 Jul 2024 22:32:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09f4ad44-413c-4c7a-ac26-c88aba6d1b97 X-Archives-Hash: 470ab0e42f9d2c868d1a620e547a19c7 commit: 101b47b0d549927a2d36b7bec3be03ef6605cb50 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Jul 31 22:31:16 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Jul 31 22:31:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101b47b0 sys-devel/binutils: Add stable-branch live ebuild and mechanisms for it Signed-off-by: Andreas K. Hüttel gentoo.org> .../{binutils-9999.ebuild => binutils-2.43.9999.ebuild} | 16 ++++++++++++---- sys-devel/binutils/binutils-9999.ebuild | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-2.43.9999.ebuild similarity index 97% copy from sys-devel/binutils/binutils-9999.ebuild copy to sys-devel/binutils/binutils-2.43.9999.ebuild index ccf31a101405..c05f1529d8c1 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-2.43.9999.ebuild @@ -22,9 +22,12 @@ IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins sta PATCH_VER=1 PATCH_DEV=dilfridge -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 SLOT=${PV} +elif [[ ${PV} == *9999 ]]; then + inherit git-r3 + SLOT=$(ver_cut 1-2) else PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} PATCH_DEV=${PATCH_DEV:-dilfridge} @@ -79,12 +82,15 @@ RESTRICT="!test? ( test )" MY_BUILDDIR=${WORKDIR}/build src_unpack() { - if [[ ${PV} == 9999* ]] ; then + 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 + if [[ ${PV} != 9999 ]] ; then + EGIT_BRANCH=binutils-$(ver_cut 1)_$(ver_cut 2)-branch + fi EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" S=${WORKDIR}/binutils EGIT_CHECKOUT_DIR=${S} @@ -108,13 +114,15 @@ src_unpack() { src_prepare() { local patchsetname - if [[ ${PV} == 9999* ]] ; then + if [[ ${PV} == 9999 ]] ; then patchsetname="from git master" + elif [[ ${PV} == *9999 ]] ; then + patchsetname="from git branch ${EGIT_BRANCH}" else patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}" fi - if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then + if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then if ! use vanilla; then einfo "Applying binutils patchset ${patchsetname}" eapply "${WORKDIR}/patch" diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index ccf31a101405..c05f1529d8c1 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -22,9 +22,12 @@ IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins sta PATCH_VER=1 PATCH_DEV=dilfridge -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 SLOT=${PV} +elif [[ ${PV} == *9999 ]]; then + inherit git-r3 + SLOT=$(ver_cut 1-2) else PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} PATCH_DEV=${PATCH_DEV:-dilfridge} @@ -79,12 +82,15 @@ RESTRICT="!test? ( test )" MY_BUILDDIR=${WORKDIR}/build src_unpack() { - if [[ ${PV} == 9999* ]] ; then + 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 + if [[ ${PV} != 9999 ]] ; then + EGIT_BRANCH=binutils-$(ver_cut 1)_$(ver_cut 2)-branch + fi EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" S=${WORKDIR}/binutils EGIT_CHECKOUT_DIR=${S} @@ -108,13 +114,15 @@ src_unpack() { src_prepare() { local patchsetname - if [[ ${PV} == 9999* ]] ; then + if [[ ${PV} == 9999 ]] ; then patchsetname="from git master" + elif [[ ${PV} == *9999 ]] ; then + patchsetname="from git branch ${EGIT_BRANCH}" else patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}" fi - if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then + if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then if ! use vanilla; then einfo "Applying binutils patchset ${patchsetname}" eapply "${WORKDIR}/patch"