From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S80WE-0005dj-K5 for garchives@archives.gentoo.org; Thu, 15 Mar 2012 02:34:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7681E09E2; Thu, 15 Mar 2012 02:34:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 84F4BE09E2 for ; Thu, 15 Mar 2012 02:34:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3E032AC02F for ; Thu, 15 Mar 2012 02:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7645DE542C for ; Thu, 15 Mar 2012 02:34:10 +0000 (UTC) From: "Francois Bissey" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Francois Bissey" Message-ID: <1331778363.1c84ded1f77ff80428f7d4c4c4575ed563b4dab6.fbissey@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/openblas/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/openblas/ChangeLog sci-libs/openblas/openblas-0.1_alpha2.ebuild sci-libs/openblas/openblas-9999.ebuild X-VCS-Directories: sci-libs/openblas/ X-VCS-Committer: fbissey X-VCS-Committer-Name: Francois Bissey X-VCS-Revision: 1c84ded1f77ff80428f7d4c4c4575ed563b4dab6 X-VCS-Branch: master Date: Thu, 15 Mar 2012 02:34:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d2154c05-5731-48ae-a75b-1cac949fd467 X-Archives-Hash: 9f59e0a4b453714c22bf10b1cf0e98ff commit: 1c84ded1f77ff80428f7d4c4c4575ed563b4dab6 Author: Fran=C3=A7ois Bissey canterbury a= c nz> AuthorDate: Thu Mar 15 02:26:03 2012 +0000 Commit: Francois Bissey massey ac nz> CommitDate: Thu Mar 15 02:26:03 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D1c84ded1 Add *-macos prefix support to openblas --- sci-libs/openblas/ChangeLog | 6 +++++- sci-libs/openblas/openblas-0.1_alpha2.ebuild | 22 ++++++++++++++++++--= -- sci-libs/openblas/openblas-9999.ebuild | 22 +++++++++++++++++++-= -- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog index 8c45990..6c76032 100644 --- a/sci-libs/openblas/ChangeLog +++ b/sci-libs/openblas/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-libs/openblas -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 15 Mar 2012; Fran=C3=A7ois Bissey + openblas-0.1_alpha2.ebuild, openblas-9999.ebuild: + Add *-macos prefix support + 16 Aug 2011; Fran=C3=A7ois Bissey openblas-0.1_alpha2.ebuild, openblas-9999.ebuild: Include extra line in pkgconfig for incblas before installing it - not= after. diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/open= blas/openblas-0.1_alpha2.ebuild index d727f93..a5bdbbd 100644 --- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild +++ b/sci-libs/openblas/openblas-0.1_alpha2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -13,7 +13,7 @@ EGIT_COMMIT=3D"v0.1alpha2.2" =20 LICENSE=3D"BSD" SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" +KEYWORDS=3D"~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos" =20 IUSE=3D"+incblas int64 dynamic openmp static-libs threads" =20 @@ -25,6 +25,11 @@ S=3D"${WORKDIR}/${MYPN}" pkg_setup() { ewarn "If the compilation fails, try setting the TARGET environment var= iable" ewarn "to your CPU's codename and run emerge again." + + SHLIB=3Dso + if [[ ${CHOST} =3D=3D *-darwin* ]] ; then + SHLIB=3Ddylib + fi } =20 src_prepare() { @@ -66,7 +71,7 @@ src_configure() { =20 src_compile() { mkdir solibs - emake libs shared && mv *.so solibs/ + emake libs shared && mv *."${SHLIB}" solibs/ use static-libs && emake clean && emake libs NEED_PIC=3D } =20 @@ -84,7 +89,7 @@ src_install() { profname=3D${profname}-openmp fi =20 - dolib.so solibs/lib*.so + dolib.so solibs/lib*."${SHLIB}" use static-libs && dolib.a lib*.a =20 # create pkg-config file and associated eselect file @@ -114,4 +119,13 @@ src_install() { insinto /usr/$(get_libdir)/pkgconfig doins ${profname}.pc dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.tx= t + + if [[ ${CHOST} =3D=3D *-darwin* ]] ; then + cd "${ED}"/usr/$(get_libdir) + for d in *.dylib ; do + ebegin "correcting install_name of ${d}" + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}" + eend $? + done + fi } diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/o= penblas-9999.ebuild index 5fd74db..2849c8e 100644 --- a/sci-libs/openblas/openblas-9999.ebuild +++ b/sci-libs/openblas/openblas-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -21,6 +21,13 @@ DEPEND=3D"${RDEPEND}" =20 S=3D"${WORKDIR}/${MYPN}" =20 +pkg_setup() { + SHLIB=3Dso + if [[ ${CHOST} =3D=3D *-darwin* ]] ; then + SHLIB=3Ddylib + fi +} + src_prepare() { epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch # respect LDFLAGS @@ -60,7 +67,7 @@ src_configure() { =20 src_compile() { mkdir solibs - emake libs shared && mv *.so solibs/ + emake libs shared && mv *."${SHLIB}" solibs/ use static-libs && emake clean && emake libs NEED_PIC=3D } =20 @@ -78,7 +85,7 @@ src_install() { profname=3D${profname}-openmp fi =20 - dolib.so solibs/lib*.so + dolib.so solibs/lib*."$SHLIB" use static-libs && dolib.a lib*.a =20 # create pkg-config file and associated eselect file @@ -109,4 +116,13 @@ src_install() { "/usr/include/cblas.h" "${PN}/cblas.h" fi dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.tx= t + + if [[ ${CHOST} =3D=3D *-darwin* ]] ; then + cd "${ED}"/usr/$(get_libdir) + for d in *.dylib ; do + ebegin "correcting install_name of ${d}" + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}" + eend $? + done + fi }