[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     e65892a87435c5b0dddbe7b02532eeb5ae806e46
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 07:57:41 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 07:57:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65892a8

toolchain.eclass: fix applying musl patches for live ebuilds

toolchain_fetch_git_patches had a typo for the case where we may
want to try use downloaded SRC_URI (rather than git) patches, so it
never applied them for live ebuilds.

Reported by awilfox.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7d69f3b90e91..bc61a8bddb2c 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -589,7 +589,7 @@ toolchain_fetch_git_patches() {
        mkdir "${WORKDIR}"/patch || die
        mv "${WORKDIR}"/patch.tmp/${PATCH_GCC_VER}/gentoo/* "${WORKDIR}"/patch 
|| die
 
-       if [[ -n ${MUSL_VER} || -d "${WORKDIR}"/musl ]] && [[ ${CTARGET} == 
*musl* ]] ; then
+       if [[ -z ${MUSL_VER} || -d "${WORKDIR}"/musl ]] && [[ ${CTARGET} == 
*musl* ]] ; then
                mkdir "${WORKDIR}"/musl || die
                mv "${WORKDIR}"/patch.tmp/${PATCH_GCC_VER}/musl/* 
"${WORKDIR}"/musl || die
        fi