diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2023-04-03 14:48:11 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2023-04-03 15:06:23 -0400 |
| commit | e0b7d24e4ede3433e7216c70ac6872a92d990ec3 (patch) | |
| tree | 9f75323f7986712ba13f9bdf1793ffc82f4a20d2 /sys-libs/musl | |
| parent | sys-libs/musl: quote EPREFIX (diff) | |
| download | gentoo-e0b7d24e4ede3433e7216c70ac6872a92d990ec3.tar.gz gentoo-e0b7d24e4ede3433e7216c70ac6872a92d990ec3.tar.bz2 gentoo-e0b7d24e4ede3433e7216c70ac6872a92d990ec3.zip | |
sys-libs/musl: use dosym8 -r for /usr/bin/ldd symlink
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-libs/musl')
| -rw-r--r-- | sys-libs/musl/musl-1.2.3-r8.ebuild | 8 | ||||
| -rw-r--r-- | sys-libs/musl/musl-9999.ebuild | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild index 4073f5c246b7..9d815eafd4f6 100644 --- a/sys-libs/musl/musl-1.2.3-r8.ebuild +++ b/sys-libs/musl/musl-1.2.3-r8.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs prefix +inherit eapi8-dosym flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -141,10 +141,10 @@ src_install() { just_headers && return 0 # musl provides ldd via a sym link to its ld.so - local sysroot + local sysroot= is_crosscompile && sysroot=/usr/${CTARGET} - local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) - dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd + local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) + dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 4073f5c246b7..9d815eafd4f6 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs prefix +inherit eapi8-dosym flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -141,10 +141,10 @@ src_install() { just_headers && return 0 # musl provides ldd via a sym link to its ld.so - local sysroot + local sysroot= is_crosscompile && sysroot=/usr/${CTARGET} - local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) - dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd + local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) + dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead |