From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DC9515817D for ; Tue, 18 Jun 2024 15:49:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EE1DE29FF; Tue, 18 Jun 2024 15:49:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47709E29FF for ; Tue, 18 Jun 2024 15:49:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C0EF335D75 for ; Tue, 18 Jun 2024 15:49:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C84C1158 for ; Tue, 18 Jun 2024 15:49:08 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1718725746.3f4b5440ef1e9b77b465dcaf0a0e104238ff6ed8.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild app-arch/xz-utils/xz-utils-9999.ebuild X-VCS-Directories: app-arch/xz-utils/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 3f4b5440ef1e9b77b465dcaf0a0e104238ff6ed8 X-VCS-Branch: master Date: Tue, 18 Jun 2024 15:49:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab7af382-61c9-4a6d-8594-2932fd2be508 X-Archives-Hash: 0f42cef783ad0f2087fafecfc95cf439 commit: 3f4b5440ef1e9b77b465dcaf0a0e104238ff6ed8 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jun 18 15:45:38 2024 +0000 Commit: Fabian Groffen gentoo 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 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 }