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 1S8Ik8-0002lP-1I for garchives@archives.gentoo.org; Thu, 15 Mar 2012 22:01:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CC70E0955; Thu, 15 Mar 2012 22:01:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2EE0AE0955 for ; Thu, 15 Mar 2012 22:01:46 +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 1CBC51B4026 for ; Thu, 15 Mar 2012 22:01:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D6E49E5402 for ; Thu, 15 Mar 2012 22:01:44 +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: <1331848841.ac4b72bcd78bf018322cf27d4e354289f37f4adb.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: ac4b72bcd78bf018322cf27d4e354289f37f4adb X-VCS-Branch: master Date: Thu, 15 Mar 2012 22:01:44 +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: eaab9392-4e48-4632-b5b9-1c52f9abfaed X-Archives-Hash: 4d40d5c6a087b4959af178b36fc3070d commit: ac4b72bcd78bf018322cf27d4e354289f37f4adb Author: Fran=C3=A7ois Bissey canterbury a= c nz> AuthorDate: Thu Mar 15 22:00:41 2012 +0000 Commit: Francois Bissey massey ac nz> CommitDate: Thu Mar 15 22:00:41 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dac4b72bc switch to multilib in openblas, gotoblas2 will come later as it needs ano= ther fix --- sci-libs/openblas/ChangeLog | 4 ++++ sci-libs/openblas/openblas-0.1_alpha2.ebuild | 11 +++-------- sci-libs/openblas/openblas-9999.ebuild | 13 +++---------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog index 6c76032..db34a8d 100644 --- a/sci-libs/openblas/ChangeLog +++ b/sci-libs/openblas/ChangeLog @@ -4,6 +4,10 @@ =20 15 Mar 2012; Fran=C3=A7ois Bissey openblas-0.1_alpha2.ebuild, openblas-9999.ebuild: + use multilib eclass + + 15 Mar 2012; Fran=C3=A7ois Bissey + openblas-0.1_alpha2.ebuild, openblas-9999.ebuild: Add *-macos prefix support =20 16 Aug 2011; Fran=C3=A7ois Bissey diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/open= blas/openblas-0.1_alpha2.ebuild index a5bdbbd..1290d45 100644 --- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild +++ b/sci-libs/openblas/openblas-0.1_alpha2.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -inherit eutils toolchain-funcs alternatives-2 git-2 +inherit eutils toolchain-funcs alternatives-2 git-2 multilib =20 DESCRIPTION=3D"Optimized BLAS library based on GotoBLAS2" HOMEPAGE=3D"http://xianyi.github.com/OpenBLAS/" @@ -25,11 +25,6 @@ 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() { @@ -71,7 +66,7 @@ src_configure() { =20 src_compile() { mkdir solibs - emake libs shared && mv *."${SHLIB}" solibs/ + emake libs shared && mv *.$(get_libname) solibs/ use static-libs && emake clean && emake libs NEED_PIC=3D } =20 @@ -89,7 +84,7 @@ src_install() { profname=3D${profname}-openmp fi =20 - dolib.so solibs/lib*."${SHLIB}" + dolib.so solibs/lib*.$(get_libname) use static-libs && dolib.a lib*.a =20 # create pkg-config file and associated eselect file diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/o= penblas-9999.ebuild index 2849c8e..11de912 100644 --- a/sci-libs/openblas/openblas-9999.ebuild +++ b/sci-libs/openblas/openblas-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -inherit eutils toolchain-funcs alternatives-2 git-2 +inherit eutils toolchain-funcs alternatives-2 git-2 multilib =20 DESCRIPTION=3D"Optimized BLAS library based on GotoBLAS2" HOMEPAGE=3D"http://xianyi.github.com/OpenBLAS/" @@ -21,13 +21,6 @@ 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 @@ -67,7 +60,7 @@ src_configure() { =20 src_compile() { mkdir solibs - emake libs shared && mv *."${SHLIB}" solibs/ + emake libs shared && mv *.$(get_libname) solibs/ use static-libs && emake clean && emake libs NEED_PIC=3D } =20 @@ -85,7 +78,7 @@ src_install() { profname=3D${profname}-openmp fi =20 - dolib.so solibs/lib*."$SHLIB" + dolib.so solibs/lib*.$(get_libname) use static-libs && dolib.a lib*.a =20 # create pkg-config file and associated eselect file