diff options
| author |   Kofi Hannam <meeyou@tuta.io> | 2021-11-22 11:58:15 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-11-22 11:58:49 +0000 |
| commit | d9a66f3d2030eb59c117cb96296d7a617d757fc1 (patch) | |
| tree | 025d980da09a63089069deaf178f9533d4e45b8d /sys-libs | |
| parent | sys-apps/openrc: backport SELinux + no PAM build fixes (diff) | |
| download | gentoo-d9a66f3d2030eb59c117cb96296d7a617d757fc1.tar.gz gentoo-d9a66f3d2030eb59c117cb96296d7a617d757fc1.tar.bz2 gentoo-d9a66f3d2030eb59c117cb96296d7a617d757fc1.zip | |
sys-libs/musl: exit early in ldconfig if nothing has changed
This fixes an access violation when compiling sys-libs/ncurses
and /usr/bin/ld is not ld.bfd.
Closes: https://bugs.gentoo.org/719330
Closes: https://github.com/gentoo/gentoo/pull/21939
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Kofi Hannam <meeyou@tuta.io>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/musl/files/ldconfig.in-r1 | 8 | ||||
| -rw-r--r-- | sys-libs/musl/musl-1.2.2-r6.ebuild (renamed from sys-libs/musl/musl-1.2.2-r5.ebuild) | 0 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sys-libs/musl/files/ldconfig.in-r1 b/sys-libs/musl/files/ldconfig.in-r1 index 1b565baf9eed..7bf254dfd91c 100644 --- a/sys-libs/musl/files/ldconfig.in-r1 +++ b/sys-libs/musl/files/ldconfig.in-r1 @@ -116,6 +116,13 @@ sanitize() { echo ${drs} } +changed() { + [[ -f ${ETC_LDSO_PATH} ]] || return 0 + local current=$(<${ETC_LDSO_PATH}) + current=${current//$'\n'/ } + [[ ${current} != ${drs} ]] || return 1 +} + get_options "$@" if [[ ! -e ${LDSO_CONF} ]]; then @@ -139,6 +146,7 @@ LDSO_ARCH=$(basename ${LDSO_PATH}) LDSO_NAME=${LDSO_ARCH%.so.1} ETC_LDSO_PATH="${ROOT}/etc/${LDSO_NAME}.path" +changed || exit 0 X=$(mktemp -p /tmp ${LDSO_NAME}.XXXXXX) for d in ${drs}; do echo ${d} >> ${X} diff --git a/sys-libs/musl/musl-1.2.2-r5.ebuild b/sys-libs/musl/musl-1.2.2-r6.ebuild index f22728391c1d..f22728391c1d 100644 --- a/sys-libs/musl/musl-1.2.2-r5.ebuild +++ b/sys-libs/musl/musl-1.2.2-r6.ebuild |