From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 544C9138206 for ; Thu, 28 Apr 2016 15:07:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB7D921C0C9; Thu, 28 Apr 2016 15:07:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23A2121C0C9 for ; Thu, 28 Apr 2016 15:07:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03B39340CC7 for ; Thu, 28 Apr 2016 15:07:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46F8A333 for ; Thu, 28 Apr 2016 15:07:12 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1461855943.5306100a4e38cf250329ccbcbfaf94502c39913a.haubi@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-r7.ebuild X-VCS-Directories: app-arch/bzip2/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 5306100a4e38cf250329ccbcbfaf94502c39913a X-VCS-Branch: master Date: Thu, 28 Apr 2016 15:07:12 +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: edc550e8-5792-43a9-a8a1-cade2f36bc94 X-Archives-Hash: 8333045d4c6abcf22fb1ec17cf5f873e commit: 5306100a4e38cf250329ccbcbfaf94502c39913a Author: Michael Haubenwallner ssi-schaefer com> AuthorDate: Thu Apr 28 15:05:31 2016 +0000 Commit: Michael Haubenwallner gentoo 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