commit: 64595ed4a949338de01a76137d266494cdb23550 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jul 29 06:53:42 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jul 29 18:25:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64595ed4
sys-libs/glibc: tweak live conditionals to facilitate branches Facilitate 2.41.9999 and so on. Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/glibc/glibc-9999.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index bbb2337cb544..10446c984609 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -38,7 +38,7 @@ inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfi DESCRIPTION="GNU libc C library" HOMEPAGE="https://www.gnu.org/software/libc/"; -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 else #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" @@ -930,7 +930,7 @@ src_unpack() { use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz - if [[ ${PV} == 9999* ]] ; then + if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI=" https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git https://github.com/gentoo/glibc-patches.git @@ -944,12 +944,13 @@ src_unpack() { https://gitlab.com/x86-glibc/glibc.git " EGIT_CHECKOUT_DIR=${S} + [[ ${PV} == *.*.9999 ]] && EGIT_BRANCH=release/${PV%.*}/master git-r3_src_unpack else unpack ${P}.tar.xz cd "${WORKDIR}" || die - unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz + unpack ${P}-patches-${PATCH_VER}.tar.xz fi cd "${WORKDIR}" || die
