commit: 3f4b5440ef1e9b77b465dcaf0a0e104238ff6ed8 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Jun 18 15:45:38 2024 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Jun 18 15:49:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4b5440
app-arch/xz-utils: unbreak install on macOS Fix for bug 934370 added a sanity check, but since Mach-O targets have different naming for shared libraries, this caused the installation to fail even though the build was fine. Thanks ZongyuZ for the patch for this in bug #934515 using get_libname function to make this work on macOS too. Closes: https://bugs.gentoo.org/934515 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild | 8 ++++---- app-arch/xz-utils/xz-utils-9999.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild b/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild index e63700af983e..81f46758676f 100644 --- a/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild @@ -178,11 +178,11 @@ multilib_src_compile() { multilib_src_install() { default - # bug #934370 and bug #450436 - if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma.so" ]] ; then - eerror "Sanity check for liblzma.so failed." + # bug #934370 and bug #450436 (and bug #934515) + if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma$(get_libname)" ]] ; then + eerror "Sanity check for liblzma$(get_libname) failed." eerror "Shared library wasn't built, possible libtool bug" - [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma.so not found in build, aborting" + [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma$(get_libname) not found in build, aborting" fi } diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index d4d61aa545e8..1bebf4e84bf4 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -180,11 +180,11 @@ multilib_src_compile() { multilib_src_install() { default - # bug #934370 and bug #450436 - if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma.so" ]] ; then - eerror "Sanity check for liblzma.so failed." + # bug #934370 and bug #450436 (and bug #934515) + if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma$(get_libname)" ]] ; then + eerror "Sanity check for liblzma$(get_libname) failed." eerror "Shared library wasn't built, possible libtool bug" - [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma.so not found in build, aborting" + [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma$(get_libname) not found in build, aborting" fi }
