gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

sys-libs/musl: fix -crypt build for cross

Browse Source 
See https://forums.gentoo.org/viewtopic-p-8850196.html. We need to
account for ${sysroot} for cross builds.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-12-31 15:39:04 +00:00
parent ae4edd3f04
commit 335b2bb125
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys-libs/musl/musl-1.2.4-r1.ebuild
View File

@@ -140,8 +140,8 @@ src_install() {
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
rm "${ED}/usr/include/crypt.h" || die
rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
rm "${ED}${sysroot}/usr/include/crypt.h" || die
rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
fi
if ! is_crosspkg ; then

4
sys-libs/musl/musl-1.2.4-r2.ebuild
View File

@@ -141,8 +141,8 @@ src_install() {
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
rm "${ED}/usr/include/crypt.h" || die
rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
rm "${ED}${sysroot}/usr/include/crypt.h" || die
rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
fi
if ! is_crosspkg ; then

4
sys-libs/musl/musl-1.2.5-r1.ebuild
View File

@@ -142,8 +142,8 @@ src_install() {
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
rm "${ED}/usr/include/crypt.h" || die
rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
rm "${ED}${sysroot}/usr/include/crypt.h" || die
rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
fi
if ! is_crosspkg ; then

4
sys-libs/musl/musl-9999.ebuild
View File

@@ -138,8 +138,8 @@ src_install() {
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
rm "${ED}/usr/include/crypt.h" || die
rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
rm "${ED}${sysroot}/usr/include/crypt.h" || die
rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
fi
if ! is_crosspkg ; then