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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E0D91396D9 for ; Sun, 19 Nov 2017 12:44:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52E9CE0D1A; Sun, 19 Nov 2017 12:44:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3084AE0D1A for ; Sun, 19 Nov 2017 12:44:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D4F63406D1 for ; Sun, 19 Nov 2017 12:44:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5D01A027 for ; Sun, 19 Nov 2017 12:44:23 +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: <1511095256.9fbf7589d45aa09df2007ffd817dba72c37b94da.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: app-arch/bzip2/bzip2-1.0.6-r8.ebuild X-VCS-Directories: app-arch/bzip2/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 9fbf7589d45aa09df2007ffd817dba72c37b94da X-VCS-Branch: master Date: Sun, 19 Nov 2017 12:44:23 +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-Archives-Salt: 223ea812-cffd-478c-ba62-119e32528a0c X-Archives-Hash: 00f78bbaa169bd3710c930869ed7afc1 commit: 9fbf7589d45aa09df2007ffd817dba72c37b94da Author: Fabian Groffen gentoo org> AuthorDate: Sun Nov 19 12:40:56 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Nov 19 12:40:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9fbf7589 app-arch/bzip2: fix install on Darwin, bug #637966 Bug: https://bugs.gentoo.org/637966 Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild index eeb7f85da2..498b5bb32c 100644 --- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild +++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild @@ -73,9 +73,24 @@ bemake() { } multilib_src_compile() { - bemake -f "${S}"/Makefile-libbz2_so all - # Make sure we link against the shared lib #504648 - ln -sf libbz2.so.${PV} libbz2.so + local checkopts= + case "${CHOST}" in + *-darwin*) + bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all + # FWIW, #504648 like for .so below + ln -sf libbz2.${PV}.dylib libbz2.dylib + ;; + *-mint*) + # do nothing, no shared libraries + : + ;; + *) + bemake -f "${S}"/Makefile-libbz2_so all + # Make sure we link against the shared lib #504648 + [[ $(get_libname) != $(get_libname ${PV}) ]] && + ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) + ;; + esac bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" }