public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
Date: Sun, 19 Nov 2017 12:44:23 +0000 (UTC)	[thread overview]
Message-ID: <1511095256.9fbf7589d45aa09df2007ffd817dba72c37b94da.grobian@gentoo> (raw)

commit:     9fbf7589d45aa09df2007ffd817dba72c37b94da
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 12:40:56 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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 '')"
 }
 


             reply	other threads:[~2017-11-19 12:44 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-19 12:44 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-31 14:38 [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/ Fabian Groffen
2022-09-07 19:35 Fabian Groffen
2021-01-06 11:56 Fabian Groffen
2020-12-27 10:25 Fabian Groffen
2020-12-27 10:14 Fabian Groffen
2020-12-26 13:24 Fabian Groffen
2020-12-15 19:26 Fabian Groffen
2016-04-28 15:07 Michael Haubenwallner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1511095256.9fbf7589d45aa09df2007ffd817dba72c37b94da.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox