diff options
| author |   Sam James <sam@gentoo.org> | 2024-06-15 08:57:41 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-06-15 08:57:41 +0100 |
| commit | e65892a87435c5b0dddbe7b02532eeb5ae806e46 (patch) | |
| tree | d727b4ab17151158b4062d230e3a37377aaa4de0 /eclass | |
| parent | profiles/package.mask: mask <dev-vcs/mercurial-6.7.4 (diff) | |
| download | gentoo-e65892a87435c5b0dddbe7b02532eeb5ae806e46.tar.gz gentoo-e65892a87435c5b0dddbe7b02532eeb5ae806e46.tar.bz2 gentoo-e65892a87435c5b0dddbe7b02532eeb5ae806e46.zip | |
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@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 2 |
1 files changed, 1 insertions, 1 deletions
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 |