public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Haubenwallner" <haubi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/
Date: Thu, 28 Apr 2016 15:07:12 +0000 (UTC)	[thread overview]
Message-ID: <1461855943.5306100a4e38cf250329ccbcbfaf94502c39913a.haubi@gentoo> (raw)

commit:     5306100a4e38cf250329ccbcbfaf94502c39913a
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Thu Apr 28 15:05:31 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 15:05:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5306100a

bzip2-1.0.6-r7: Cygwin port

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index d07ed3d..23a6674 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -55,6 +55,12 @@ src_prepare() {
 			sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' Makefile-libbz2_so || die "cannt set soname"
 		fi
 	fi
+	if [[ ${CHOST} == *-cygwin* ]] ; then
+		sed -i -e "s/-o libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
+			   -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o cygbz2-${PV%%.*}.dll/" \
+			   -e "s/libbz2\.so/libbz2$(get_libname)/g" \
+			Makefile-libbz2_so
+	fi
 }
 
 bemake() {
@@ -81,7 +87,8 @@ 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
+			[[ $(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 '')"
@@ -97,7 +104,9 @@ multilib_src_install() {
 	#  .x.x   - SONAME some distros use #338321
 	#  .x     - SONAME Gentoo uses
 	dolib.so libbz2$(get_libname ${PV})
+	[[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
 	local v
+	[[ $(get_libname) != $(get_libname ${PV}) ]] &&
 	for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
 		dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
 	done


             reply	other threads:[~2016-04-28 15:07 UTC|newest]

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

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=1461855943.5306100a4e38cf250329ccbcbfaf94502c39913a.haubi@gentoo \
    --to=haubi@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