[gentoo-commits] proj/sci:master commit in: sci-libs/openblas/

["Francois Bissey" <f.r.bissey@massey.ac.nz>]

commit:     1c84ded1f77ff80428f7d4c4c4575ed563b4dab6
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Mar 15 02:26:03 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Mar 15 02:26:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1c84ded1

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: $
 
+  15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
+  Add *-macos prefix support
+
   16 Aug 2011; François Bissey <francois.bissey@canterbury.ac.nz>
   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/openblas/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: $
 
@@ -13,7 +13,7 @@ EGIT_COMMIT="v0.1alpha2.2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
 
 IUSE="+incblas int64 dynamic openmp static-libs threads"
 
@@ -25,6 +25,11 @@ S="${WORKDIR}/${MYPN}"
 pkg_setup() {
 	ewarn "If the compilation fails, try setting the TARGET environment variable"
 	ewarn "to your CPU's codename and run emerge again."
+
+	SHLIB=so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		SHLIB=dylib
+	fi
 }
 
 src_prepare() {
@@ -66,7 +71,7 @@ src_configure() {
 
 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=
 }
 
@@ -84,7 +89,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*.so
+	dolib.so solibs/lib*."${SHLIB}"
 	use static-libs && dolib.a lib*.a
 
 	# 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}.txt
+
+	if [[ ${CHOST} == *-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/openblas-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: $
 
@@ -21,6 +21,13 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYPN}"
 
+pkg_setup() {
+	SHLIB=so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		SHLIB=dylib
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
 	# respect LDFLAGS
@@ -60,7 +67,7 @@ src_configure() {
 
 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=
 }
 
@@ -78,7 +85,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*.so
+	dolib.so solibs/lib*."$SHLIB"
 	use static-libs && dolib.a lib*.a
 
 	# 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}.txt
+
+	if [[ ${CHOST} == *-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
 }