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

[Justin Lecher]

commit: 87bd5dfcf80bd28990815fc776575a4244b9c1aa
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Apr 30 10:25:29 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Apr 30 10:25:29 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=87bd5dfc

sci-libs/openblas: Drop ppc64 support

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/metadata.xml   | 2 +-
 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 1f64b9df9..2bf0b4229 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 3ff5f8502..49d011ead 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

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

[Benda XU]

commit: d5ac214327ad893643c77adf474305c8a12cb09a
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun  6 04:06:32 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun  6 04:11:34 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5ac2143

sci-libs/openblas: remove redundant libdir from Libs in .pc

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 1993df94a..c44cd74c9 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -168,7 +168,7 @@ src_install() {
 
create_pkgconfig \
--name "${profname}" \
-   --libs "-L\${libdir} -l${libname}" \
+   --libs "-l${libname}" \
--libs-private "-lm" \
--cflags "-I\${includedir}/${PN} 
${openblas_abi_cflags}" \
${profname}

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

[Benda XU]

commit: d10535319c19d2e0e4fad56ebeed85ad874eb980
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Apr  2 04:16:28 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Apr  2 04:18:16 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d1053531

sci-libs/openblas: advise openmp cflags in pkg-config.

 sci-libs/openblas/openblas-0.2.15.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 6dc5fd3c2..c419d8974 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -67,6 +67,7 @@ get_openblas_abi_cflags() {
fi
$(numeric-int64_is_int64_build) && \
openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   use openmp && openblas_abi_cflags+=( -fopenmp )
echo "${openblas_abi_cflags[@]}"
 }
 

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

[Benda XU]

commit: 6538b395b3be07a04a76b3af9a7d6aa81df7f29d
Author: Benda Xu  gentoo  org>
AuthorDate: Fri Aug 25 06:28:30 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri Aug 25 06:28:30 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6538b395

sci-libs/openblas: fix DESTDIR and PREFIX for cmake directories.

Closes: https://github.com/gentoo/sci/pull/725

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.14-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.15-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.19-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.20.ebuild| 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
index 453be881f..ba7aa8298 100644
--- a/sci-libs/openblas/openblas-0.2.14-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
@@ -143,9 +143,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.15-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
index 64e2fb9c1..e4f0c89ed 100644
--- a/sci-libs/openblas/openblas-0.2.15-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
@@ -144,9 +144,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.19-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
index 81ed705fb..38378cecd 100644
--- a/sci-libs/openblas/openblas-0.2.19-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
@@ -149,9 +149,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index 4686f4890..c15c6eb73 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -146,9 +146,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

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

[Benda XU]

commit: 0e143007295f7fe3fe1b5f9506817216d5eb80e2
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Aug 28 07:37:03 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Aug 28 07:37:03 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0e143007

sci-libs/openblas: USE flags of single-threaded version.

  When neither openmp nor threads USE flag is set, OpenBLAS
  should build a single-threaded version with make option
  USE_THREAD=0.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.20.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index c15c6eb73..838c334d6 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -40,6 +40,8 @@ get_openblas_flags() {
openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
elif use openmp; then
openblas_flags+=( USE_OPENMP=1 )
+   else
+   openblas_flags+=( USE_THREAD=0 ) # single-threaded
fi
local profname=$(numeric-int64_get_module_name)
local libname="${profname//-/_}"

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

[Justin Lecher]

commit: 298eb745aa2dd2606616e821ae00cf0773d4d20d
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:54:43 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:54:43 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=298eb745

sci-libs/openblas: Inherit from eutils and multilib eclasses

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.15.ebuild | 2 +-
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 25ccea3..2dba543 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 git-r3 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils git-r3 multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

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

[Justin Lecher]

commit: b732e197ccd3fac26ad8fe3d74864688471b9128
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:53:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:53:04 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b732e197

sci-libs/openblas: Version Bump

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.15.ebuild | 193 +++
 1 file changed, 193 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
new file mode 100644
index 000..3a92aef
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NUMERIC_MODULE_NAME="openblas"
+
+inherit alternatives-2 numeric numeric-int64-multibuild
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+SRC_URI="
+   http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
+   http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+IUSE="dynamic openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=()
+   use dynamic && \
+   openblas_flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1 )
+   $(numeric-int64_is_int64_build) && \
+   openblas_flags+=( INTERFACE64=1 )
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
+   elif use openmp; then
+   openblas_flags+=( USE_OPENMP=1 )
+   fi
+   local profname=$(numeric-int64_get_module_name)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
+   fi
+   echo "${openblas_flags[@]}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=()
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1 )
+   else
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1 )
+   fi
+   $(numeric-int64_is_int64_build) && \
+   openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   echo "${openblas_abi_cflags[@]}"
+}
+
+src_unpack() {
+   default
+   find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+}
+
+src_prepare() {
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   numeric-int64-multibuild_copy_sources
+}
+
+src_configure() {
+   blas_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
+   -i Makefile.rule || die
+   }
+   numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir 
blas_configure
+}
+
+src_compile() {
+   # openblas already does multi-jobs
+   MAKEOPTS+=" -j1"
+   my_src_compile () {
+   local openblas_flags=$(get_openblas_flags)
+   # cflags already defined twice
+   unset CFLAGS || die
+   emake clean && emake libs shared ${openblas_flags}
+   mkdir -p libs && mv libopenblas* libs/ || die
+   # avoid pic when compiling static libraries, so re-compiling
+   if use static-libs; then
+   emake clean
+   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+   mv libopenblas* libs/ || die
+   fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+

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

[Justin Lecher]

commit: e9bbf6fa193ac1498c45c8af44663f5c97beff15
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:21:32 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:21:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9bbf6fa

sci-libs/openblas: Add missing eclass

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog  | 4 
 sci-libs/openblas/openblas-0.2.11.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.8.ebuild  | 4 ++--
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9723819..e783b9d 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  openblas-0.2.11.ebuild,
+  openblas-0.2.8.ebuild, openblas-.ebuild:
+  sci-libs/openblas: Add missing eclass
+
   06 Jun 2015; Justin Lecher  metadata.xml:
   sci-libs/openblas: Add github to remote-id in metadata.xml
 

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
index 2b5f76d..c69932e 100644
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

diff --git a/sci-libs/openblas/openblas-0.2.8.ebuild 
b/sci-libs/openblas/openblas-0.2.8.ebuild
index 96ca05b..565215b 100644
--- a/sci-libs/openblas/openblas-0.2.8.ebuild
+++ b/sci-libs/openblas/openblas-0.2.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-inherit eutils toolchain-funcs alternatives-2 multilib fortran-2
+inherit eutils multilib toolchain-funcs alternatives-2 multilib fortran-2
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index db150b0..c5166a3 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

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

[Justin Lecher]

commit: 2f8ff7d4e563d23bafad5eccd2c18d6ec5a5a343
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:19:52 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:19:52 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2f8ff7d4

sci-libs/openblas: Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/metadata.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 0912ff1..9723819 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  metadata.xml:
+  sci-libs/openblas: Add github to remote-id in metadata.xml
+
   02 Apr 2015; Marius Brehler  openblas-.ebuild:
   Fix Bug 528974
 

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 32441d1..6ef9b54 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -10,4 +10,7 @@
 Build the 64 bits integer library
 Build dynamic architecture detection at run time (for 
multi targets)
   
+  
+xianyi/OpenBLAS
+  
 

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

[Justin Lecher]

commit: 27ed0382803df0e13f89838353309dfd81f509a1
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Feb 21 15:15:57 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Feb 21 15:15:57 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=27ed0382

sci-libs/openblas: Build 32bit binaries using BINARY=32 as suggested by upstream

* Bump to EAPI=6

Github: Closes gentoo-science/sci#591

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 13 ++---
 sci-libs/openblas/openblas-0.2.15.ebuild | 13 ++---
 sci-libs/openblas/openblas-.ebuild   | 13 ++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 2dba543..b7bf4a2 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -65,7 +72,7 @@ get_openblas_abi_cflags() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

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

[Justin Lecher]

commit: 471609fcab6425d25cb775092e422df83153b1b6
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:56:27 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:56:27 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=471609fc

sci-libs/openblas: Cleanup symlinks and files

 sci-libs/openblas/openblas-0.2.11.ebuild | 228 ++-
 sci-libs/openblas/openblas-0.2.14.ebuild | 228 +--
 2 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
deleted file mode 12
index 2381753..000
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(F

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

[Justin Lecher]

commit: 22c50b8ff81041b6f864a15b29a37f318eb3ba20
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:54:54 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:54:54 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=22c50b8f

sci-libs/openblas: Fix Bug 528974

Package-Manager: portage-2.2.14

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1f27f12..0912ff1 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2015; Marius Brehler  openblas-.ebuild:
+  Fix Bug 528974
+
 *openblas-0.2.14 (27 Mar 2015)
 
   27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a532fe8..db150b0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -48,7 +48,7 @@ get_openblas_flags() {
if use threads; then
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   openblas_flags+=" USE_OPENMP=1"
fi
local profname=$(fortran-int64_get_profname)
local libname="${profname//-/_}"

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

[Denis Dupeyron]

commit: 7fcc36e404a535776e7d53f1e0bcac3e36a33f38
Author: Denis Dupeyron  gentoo  org>
AuthorDate: Fri Mar 27 20:24:53 2015 +
Commit: Denis Dupeyron  gentoo  org>
CommitDate: Fri Mar 27 20:24:53 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fcc36e4

sci-libs/openblas: version bump

 sci-libs/openblas/ChangeLog  |   7 +-
 sci-libs/openblas/openblas-0.2.14.ebuild | 227 +++
 2 files changed, 233 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index fee0835..1f27f12 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.14 (27 Mar 2015)
+
+  27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:
+  Version bump.
+
   20 Oct 2014; Mark Wright  openblas-.ebuild:
   Thanks to kiwifb for reporting
   https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )

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

[Justin Lecher]

commit: 5b5e9e7d6c21a48ad35d3fc033902201a71a06d4
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 18 14:01:11 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:05:57 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b5e9e7d

multibuild openblas when USE=int64 is specified.

---
 sci-libs/openblas/ChangeLog|   3 +
 sci-libs/openblas/openblas-.ebuild | 221 +
 2 files changed, 142 insertions(+), 82 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index caf34f2..b4f5886 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2014; Mark Wright  openblas-.ebuild:
+  multibuild openblas when USE=int64 is specified.
+
   06 Jan 2014; Justin Lecher  openblas-.ebuild,
   metadata.xml:
   Switch from git-2 to git-r3

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 618c03b..3bd158a 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit alternatives-2 eutils fortran-2 git-r3 multilib toolchain-funcs
+inherit alternatives-2 eutils fortran-2 git-r3 multilib multibuild 
toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
@@ -14,105 +14,162 @@ EGIT_BRANCH="develop"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="int64 dynamic openmp static-libs threads"
+IUSE="dynamic int64 openmp static-libs threads"
 KEYWORDS=""
 
-src_configure() {
-   # lapack and lapacke are not modified from upstream lapack
-   sed \
-   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
-   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-   -i Makefile.rule || die
-}
-
-openblas_compile() {
-   local profname=$1
-   einfo "Compiling profile ${profname}"
-   # cflags already defined twice
-   unset CFLAGS
-   emake clean
-   emake libs shared ${openblas_flags}
-   mkdir -p libs && mv libopenblas* libs/
-   # avoid pic when compiling static libraries, so re-compiling
-   if use static-libs; then
-   emake clean
-   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-   mv libopenblas* libs/
-   fi
-   cat <<-EOF > ${profname}.pc
-   prefix=${EPREFIX}/usr
-   libdir=\${prefix}/$(get_libdir)
-   includedir=\${prefix}/include
-   Name: ${PN}
-   Description: ${DESCRIPTION}
-   Version: ${PV}
-   URL: ${HOMEPAGE}
-   Libs: -L\${libdir} -lopenblas
-   Libs.private: -lm
-   Cflags: -I\${includedir}/${PN}
-   EOF
-}
+INT64_SUFFIX="int64"
+BASE_PROFNAME="openblas"
 
-src_compile() {
-   # openblas already does multi-jobs
-   MAKEOPTS+=" -j1"
-   openblas_flags=""
-   local openblas_name=openblas
+get_openblas_flags() {
+   local openblas_flags=""
use dynamic && \
-   openblas_name+="-dynamic" && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
-   use int64 && \
-   openblas_name+="-int64" && \
-   openblas_flags+=" INTERFACE64=1"
-
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   fi
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
-   openblas_name+="-threads"
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_name+="-openmp"
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
-   openblas_compile ${openblas_name}
-   mv libs/libopenblas* . || die
+   echo "${openblas_flags}"
+}
+
+get_profname() {
+   local profname="${BASE_PROFNAME}"
+   use dynamic && \
+   profname+="-dynamic"
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   profname+="-${INT64_SUFFIX}"
+   fi
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   profname+="-threads"
+   elif use openmp; then
+   profname+="-openmp"
+   fi
+   echo "${profname}"
+}
+
+pkg_setup() {
+   # The file /usr/include/openblas/openblas_config.h is generated during 
the install.
+   # By list

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

[Justin Lecher]

commit: f487803ec21a1ee723327b55fa10292146fe1d2c
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:28:21 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:28:21 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f487803e

Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 39d360f..9f9c82e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,7 +2,6 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -24,8 +23,6 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
-===
->>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Justin Lecher]

commit: 0cc5ee5acce2af5afeacb555efb5f1aa3a64c379
Author: gienah  gentoo  org>
AuthorDate: Wed Feb 19 10:16:43 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cc5ee5a

Thanks to sfabbro: dodoc should be outside the function, they do not change

---
 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index b4f5886..68e0955 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2014; Mark Wright  openblas-.ebuild:
+  Thanks to sfabbro: dodoc should be outside the function, they do not change
+
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 3bd158a..3e3cd52 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -158,9 +158,6 @@ src_install() {
doins ${pcfile}
done
 
-   dodoc 
GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-   dodoc *md Changelog.txt
-
if [[ ${CHOST} == *-darwin* ]] ; then
cd "${ED}"/usr/$(get_libdir)
local d
@@ -172,4 +169,7 @@ src_install() {
fi
}
multibuild_foreach_variant run_in_build_dir my_src_install
+
+   dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+   dodoc *md Changelog.txt
 }

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

[Justin Lecher]

commit: fbdfad7d139533e2e0d3b6993685b75772823f07
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 13 01:02:57 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:40:42 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fbdfad7d

Remove the setting of the FC and F77 environment variables, instead sed the 
COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add 
get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the 
pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the 
defines, then remove the OPENBLAS_ at the start, and sed these into COMMON_OPT 
in Makefile.rule, as USE64BITINT was removed by the patch 
openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is required 
to ensure the openblas_config.h header file is the same between ABIs.

---
 sci-libs/openblas/ChangeLog| 11 
 sci-libs/openblas/openblas-.ebuild | 50 --
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..bb794f4 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Sep 2014; Mark Wright  openblas-.ebuild:
+  Remove the setting of the FC and F77 environment variables, instead sed the
+  COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add
+  get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the
+  pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the
+  defines, then remove the OPENBLAS_ at the start, and sed these into
+  COMMON_OPT in Makefile.rule, as USE64BITINT was removed by the patch
+  openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is
+  required to ensure the openblas_config.h header file is the same between
+  ABIs.
+
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index b3854fe..61ddcf0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -55,6 +55,27 @@ get_openblas_flags() {
echo "${openblas_flags}"
 }
 
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   fi
+   echo "${openblas_abi_cflags}"
+}
+
+get_openblas_abi_fflags() {
+   local openblas_abi_fflags=""
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_fflags+="-fdefault-integer-8"
+   fi
+   echo "${openblas_abi_fflags}"
+}
+
 get_profname() {
local profname="${BASE_PROFNAME}"
use dynamic && \
@@ -118,8 +139,6 @@ _int64_multilib_multibuild_wrapper() {
 
local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -167,10 +186,12 @@ src_prepare() {
 src_configure() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
sed \
-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
-i Makefile.rule || die
}
multibuild_foreach_variant run_in_build_dir 
_int64_multilib_multibuild_wrapper my_configure
@@ -207,23 +228,12 @@ src_compile() {
Libs: -L\${libdir} -l${libname}
Libs.private: -lm
EOF
-   local openblas_abi_defs=""
-   if [[ "${ABI}" == "x86" ]]; then
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
-   else
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
-   fi
-   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   cat <<-EOF >> ${profname}.pc
-  

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

[Justin Lecher]

commit: 76559c8bbd22f9fa2093008c96a0948c95e2a7f3
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 25 13:44:08 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=76559c8b

openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI

---
 sci-libs/openblas/openblas-.ebuild | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 1c2b6c6..f012efd 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() {
# will be overwritten by the normal variant in the install, which 
removes the
# #define OPENBLAS_USE64BITINT for us.  We then specify it in Cflags in 
the
# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+   local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
local MULTIBUILD_VARIANTS=( )
-   use int64 && \
-   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
-   MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) )
-   echo "${MULTIBUILD_VARIANTS[*]}"
+   for i in "${MULTILIB_VARIANTS[@]}"; do
+   if use int64 && [[ "${i}" =~ 64$ ]]; then
+   MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
+   fi
+   MULTIBUILD_VARIANTS+=( "${i}" )
+   done
+   echo "${MULTIBUILD_VARIANTS[@]}"
 }
 
 # @FUNCTION: _int64_multilib_multibuild_wrapper
@@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() {
 _int64_multilib_multibuild_wrapper() {
debug-print-function ${FUNCNAME} "${@}"
 
-   if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   local ABI=${MULTIBUILD_VARIANT}
-   multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
-   fi
+   local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
+   multilib_toolchain_setup "${ABI}"
+   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
+   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -191,7 +193,7 @@ src_test() {
 
 src_install() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
-   my_src_install () {
+   my_src_install() {
local openblas_flags=$(get_openblas_flags)
local profname=$(get_profname)
local pcfile

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

[Justin Lecher]

commit: 78241785859c81d96e24e12dd36836b5c23df1fd
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:22:30 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:22:30 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78241785

Fix rebase lapack-multibuild to master conflict 3 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..39d360f 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -23,6 +24,8 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
+===
+>>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Mark Wright]

commit: 800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 05:54:59 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 05:54:59 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=800e8d3b

Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler 
messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')', 
thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for reporting. The 
problem was that applying the 
-0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare() 
causes build failures on assembler code as the assembler does not understand 
sizeof(float). So delay applying the patch until src_install(). Bump openblas 
to 0.2.12.

---
 sci-libs/openblas/ChangeLog  | 13 +
 sci-libs/openblas/openblas-0.2.12.ebuild |  1 +
 sci-libs/openblas/openblas-.ebuild   |  9 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1af5fd9..1ad0bed 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.12 (19 Oct 2014)
+
+  19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,
+  openblas-.ebuild:
+  Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler
+  messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing
+  ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for
+  reporting. The problem was that applying the
+  -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare()
+  causes build failures on assembler code as the assembler does not understand
+  sizeof(float). So delay applying the patch until src_install(). Bump openblas
+  to 0.2.12.
+
   13 Oct 2014; Mark Wright  openblas-.ebuild:
   Refactor openblas to use the fortran-int64.eclass. Move the virtuals from
   RDEPEND to PDEPEND to avoid circular dependencies. Specify the pkg-config

diff --git a/sci-libs/openblas/openblas-0.2.12.ebuild 
b/sci-libs/openblas/openblas-0.2.12.ebuild
new file mode 12
index 000..2381753
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.12.ebuild
@@ -0,0 +1 @@
+openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a33e449..5843200 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -80,10 +80,9 @@ src_unpack() {
 src_prepare() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
-   if [[ ${PV} != "" ]] ; then
+   if [[ ${PV} == "0.2.11" ]] ; then
epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
fi
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
# lapack and lapacke are not modified from upstream lapack
sed \
-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
@@ -160,6 +159,12 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until src_install().
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: c035b265ecc77dbab84a3492829d7de9a0c217e3
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 10:20:52 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 10:20:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c035b265

The fix for Bug 524612 failed in src_install building openblas from git. The 
fix is to move applying the patch to src_compile after building the library, 
then remove config.h and config_last.h; make config.h - ignoring the spurious 
warning; then cp config.h to config_last.h.

---
 sci-libs/openblas/ChangeLog|  6 ++
 sci-libs/openblas/openblas-.ebuild | 16 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1ad0bed..cc7349a 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2014; Mark Wright  openblas-.ebuild:
+  The fix for Bug 524612 failed in src_install building openblas from git. The
+  fix is to move applying the patch to src_compile after building the library,
+  then remove config.h and config_last.h; make config.h - ignoring the spurious
+  warning; then cp config.h to config_last.h.
+
 *openblas-0.2.12 (19 Oct 2014)
 
   19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 5843200..7c22ca6 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -125,6 +125,16 @@ src_compile() {
emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
mv libopenblas* libs/
fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until after building the libraries.
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+   rm -f config.h config_last.h
+   # Note: prints this spurious warning: make: Nothing to be done 
for 'config.h'.
+   emake config.h
+   cp config.h config_last.h || die
cat <<-EOF > ${profname}.pc
prefix=${EPREFIX}/usr
libdir=\${prefix}/$(get_libdir)
@@ -159,12 +169,6 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
-   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
-   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
-   # The problem is applying this patch in src_prepare() causes 
build failures on
-   # assembler code as the assembler does not understand 
sizeof(float).  So
-   # delay applying the patch until src_install().
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: 08e04d6e9d0357253d1ea001d7c957a74e537384
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Mon Oct 20 12:31:36 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08e04d6e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Justin Lecher]

commit: beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 20 12:34:54 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=beb6c45e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Mark Wright]

commit: 800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 05:54:59 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 05:54:59 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=800e8d3b

Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler 
messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')', 
thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for reporting. The 
problem was that applying the 
-0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare() 
causes build failures on assembler code as the assembler does not understand 
sizeof(float). So delay applying the patch until src_install(). Bump openblas 
to 0.2.12.

---
 sci-libs/openblas/ChangeLog  | 13 +
 sci-libs/openblas/openblas-0.2.12.ebuild |  1 +
 sci-libs/openblas/openblas-.ebuild   |  9 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1af5fd9..1ad0bed 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.12 (19 Oct 2014)
+
+  19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,
+  openblas-.ebuild:
+  Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler
+  messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing
+  ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for
+  reporting. The problem was that applying the
+  -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare()
+  causes build failures on assembler code as the assembler does not understand
+  sizeof(float). So delay applying the patch until src_install(). Bump openblas
+  to 0.2.12.
+
   13 Oct 2014; Mark Wright  openblas-.ebuild:
   Refactor openblas to use the fortran-int64.eclass. Move the virtuals from
   RDEPEND to PDEPEND to avoid circular dependencies. Specify the pkg-config

diff --git a/sci-libs/openblas/openblas-0.2.12.ebuild 
b/sci-libs/openblas/openblas-0.2.12.ebuild
new file mode 12
index 000..2381753
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.12.ebuild
@@ -0,0 +1 @@
+openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a33e449..5843200 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -80,10 +80,9 @@ src_unpack() {
 src_prepare() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
-   if [[ ${PV} != "" ]] ; then
+   if [[ ${PV} == "0.2.11" ]] ; then
epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
fi
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
# lapack and lapacke are not modified from upstream lapack
sed \
-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
@@ -160,6 +159,12 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until src_install().
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: c035b265ecc77dbab84a3492829d7de9a0c217e3
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 10:20:52 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 10:20:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c035b265

The fix for Bug 524612 failed in src_install building openblas from git. The 
fix is to move applying the patch to src_compile after building the library, 
then remove config.h and config_last.h; make config.h - ignoring the spurious 
warning; then cp config.h to config_last.h.

---
 sci-libs/openblas/ChangeLog|  6 ++
 sci-libs/openblas/openblas-.ebuild | 16 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1ad0bed..cc7349a 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2014; Mark Wright  openblas-.ebuild:
+  The fix for Bug 524612 failed in src_install building openblas from git. The
+  fix is to move applying the patch to src_compile after building the library,
+  then remove config.h and config_last.h; make config.h - ignoring the spurious
+  warning; then cp config.h to config_last.h.
+
 *openblas-0.2.12 (19 Oct 2014)
 
   19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 5843200..7c22ca6 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -125,6 +125,16 @@ src_compile() {
emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
mv libopenblas* libs/
fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until after building the libraries.
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+   rm -f config.h config_last.h
+   # Note: prints this spurious warning: make: Nothing to be done 
for 'config.h'.
+   emake config.h
+   cp config.h config_last.h || die
cat <<-EOF > ${profname}.pc
prefix=${EPREFIX}/usr
libdir=\${prefix}/$(get_libdir)
@@ -159,12 +169,6 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
-   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
-   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
-   # The problem is applying this patch in src_prepare() causes 
build failures on
-   # assembler code as the assembler does not understand 
sizeof(float).  So
-   # delay applying the patch until src_install().
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: 08e04d6e9d0357253d1ea001d7c957a74e537384
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Mon Oct 20 12:31:36 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08e04d6e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Justin Lecher]

commit: beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 20 12:34:54 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=beb6c45e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Justin Lecher]

commit: 5b5e9e7d6c21a48ad35d3fc033902201a71a06d4
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 18 14:01:11 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:05:57 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b5e9e7d

multibuild openblas when USE=int64 is specified.

---
 sci-libs/openblas/ChangeLog|   3 +
 sci-libs/openblas/openblas-.ebuild | 221 +
 2 files changed, 142 insertions(+), 82 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index caf34f2..b4f5886 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2014; Mark Wright  openblas-.ebuild:
+  multibuild openblas when USE=int64 is specified.
+
   06 Jan 2014; Justin Lecher  openblas-.ebuild,
   metadata.xml:
   Switch from git-2 to git-r3

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 618c03b..3bd158a 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit alternatives-2 eutils fortran-2 git-r3 multilib toolchain-funcs
+inherit alternatives-2 eutils fortran-2 git-r3 multilib multibuild 
toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
@@ -14,105 +14,162 @@ EGIT_BRANCH="develop"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="int64 dynamic openmp static-libs threads"
+IUSE="dynamic int64 openmp static-libs threads"
 KEYWORDS=""
 
-src_configure() {
-   # lapack and lapacke are not modified from upstream lapack
-   sed \
-   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
-   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-   -i Makefile.rule || die
-}
-
-openblas_compile() {
-   local profname=$1
-   einfo "Compiling profile ${profname}"
-   # cflags already defined twice
-   unset CFLAGS
-   emake clean
-   emake libs shared ${openblas_flags}
-   mkdir -p libs && mv libopenblas* libs/
-   # avoid pic when compiling static libraries, so re-compiling
-   if use static-libs; then
-   emake clean
-   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-   mv libopenblas* libs/
-   fi
-   cat <<-EOF > ${profname}.pc
-   prefix=${EPREFIX}/usr
-   libdir=\${prefix}/$(get_libdir)
-   includedir=\${prefix}/include
-   Name: ${PN}
-   Description: ${DESCRIPTION}
-   Version: ${PV}
-   URL: ${HOMEPAGE}
-   Libs: -L\${libdir} -lopenblas
-   Libs.private: -lm
-   Cflags: -I\${includedir}/${PN}
-   EOF
-}
+INT64_SUFFIX="int64"
+BASE_PROFNAME="openblas"
 
-src_compile() {
-   # openblas already does multi-jobs
-   MAKEOPTS+=" -j1"
-   openblas_flags=""
-   local openblas_name=openblas
+get_openblas_flags() {
+   local openblas_flags=""
use dynamic && \
-   openblas_name+="-dynamic" && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
-   use int64 && \
-   openblas_name+="-int64" && \
-   openblas_flags+=" INTERFACE64=1"
-
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   fi
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
-   openblas_name+="-threads"
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_name+="-openmp"
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
-   openblas_compile ${openblas_name}
-   mv libs/libopenblas* . || die
+   echo "${openblas_flags}"
+}
+
+get_profname() {
+   local profname="${BASE_PROFNAME}"
+   use dynamic && \
+   profname+="-dynamic"
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   profname+="-${INT64_SUFFIX}"
+   fi
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   profname+="-threads"
+   elif use openmp; then
+   profname+="-openmp"
+   fi
+   echo "${profname}"
+}
+
+pkg_setup() {
+   # The file /usr/include/openblas/openblas_config.h is generated during 
the install.
+   # By list

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

[Justin Lecher]

commit: f487803ec21a1ee723327b55fa10292146fe1d2c
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:28:21 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:28:21 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f487803e

Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 39d360f..9f9c82e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,7 +2,6 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -24,8 +23,6 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
-===
->>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Justin Lecher]

commit: 0cc5ee5acce2af5afeacb555efb5f1aa3a64c379
Author: gienah  gentoo  org>
AuthorDate: Wed Feb 19 10:16:43 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cc5ee5a

Thanks to sfabbro: dodoc should be outside the function, they do not change

---
 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index b4f5886..68e0955 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2014; Mark Wright  openblas-.ebuild:
+  Thanks to sfabbro: dodoc should be outside the function, they do not change
+
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 3bd158a..3e3cd52 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -158,9 +158,6 @@ src_install() {
doins ${pcfile}
done
 
-   dodoc 
GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-   dodoc *md Changelog.txt
-
if [[ ${CHOST} == *-darwin* ]] ; then
cd "${ED}"/usr/$(get_libdir)
local d
@@ -172,4 +169,7 @@ src_install() {
fi
}
multibuild_foreach_variant run_in_build_dir my_src_install
+
+   dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+   dodoc *md Changelog.txt
 }

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

[Justin Lecher]

commit: fbdfad7d139533e2e0d3b6993685b75772823f07
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 13 01:02:57 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:40:42 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fbdfad7d

Remove the setting of the FC and F77 environment variables, instead sed the 
COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add 
get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the 
pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the 
defines, then remove the OPENBLAS_ at the start, and sed these into COMMON_OPT 
in Makefile.rule, as USE64BITINT was removed by the patch 
openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is required 
to ensure the openblas_config.h header file is the same between ABIs.

---
 sci-libs/openblas/ChangeLog| 11 
 sci-libs/openblas/openblas-.ebuild | 50 --
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..bb794f4 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Sep 2014; Mark Wright  openblas-.ebuild:
+  Remove the setting of the FC and F77 environment variables, instead sed the
+  COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add
+  get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the
+  pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the
+  defines, then remove the OPENBLAS_ at the start, and sed these into
+  COMMON_OPT in Makefile.rule, as USE64BITINT was removed by the patch
+  openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is
+  required to ensure the openblas_config.h header file is the same between
+  ABIs.
+
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index b3854fe..61ddcf0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -55,6 +55,27 @@ get_openblas_flags() {
echo "${openblas_flags}"
 }
 
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   fi
+   echo "${openblas_abi_cflags}"
+}
+
+get_openblas_abi_fflags() {
+   local openblas_abi_fflags=""
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_fflags+="-fdefault-integer-8"
+   fi
+   echo "${openblas_abi_fflags}"
+}
+
 get_profname() {
local profname="${BASE_PROFNAME}"
use dynamic && \
@@ -118,8 +139,6 @@ _int64_multilib_multibuild_wrapper() {
 
local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -167,10 +186,12 @@ src_prepare() {
 src_configure() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
sed \
-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
-i Makefile.rule || die
}
multibuild_foreach_variant run_in_build_dir 
_int64_multilib_multibuild_wrapper my_configure
@@ -207,23 +228,12 @@ src_compile() {
Libs: -L\${libdir} -l${libname}
Libs.private: -lm
EOF
-   local openblas_abi_defs=""
-   if [[ "${ABI}" == "x86" ]]; then
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
-   else
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
-   fi
-   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   cat <<-EOF >> ${profname}.pc
-  

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

[Justin Lecher]

commit: 76559c8bbd22f9fa2093008c96a0948c95e2a7f3
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 25 13:44:08 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=76559c8b

openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI

---
 sci-libs/openblas/openblas-.ebuild | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 1c2b6c6..f012efd 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() {
# will be overwritten by the normal variant in the install, which 
removes the
# #define OPENBLAS_USE64BITINT for us.  We then specify it in Cflags in 
the
# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+   local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
local MULTIBUILD_VARIANTS=( )
-   use int64 && \
-   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
-   MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) )
-   echo "${MULTIBUILD_VARIANTS[*]}"
+   for i in "${MULTILIB_VARIANTS[@]}"; do
+   if use int64 && [[ "${i}" =~ 64$ ]]; then
+   MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
+   fi
+   MULTIBUILD_VARIANTS+=( "${i}" )
+   done
+   echo "${MULTIBUILD_VARIANTS[@]}"
 }
 
 # @FUNCTION: _int64_multilib_multibuild_wrapper
@@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() {
 _int64_multilib_multibuild_wrapper() {
debug-print-function ${FUNCNAME} "${@}"
 
-   if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   local ABI=${MULTIBUILD_VARIANT}
-   multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
-   fi
+   local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
+   multilib_toolchain_setup "${ABI}"
+   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
+   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -191,7 +193,7 @@ src_test() {
 
 src_install() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
-   my_src_install () {
+   my_src_install() {
local openblas_flags=$(get_openblas_flags)
local profname=$(get_profname)
local pcfile

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

[Justin Lecher]

commit: 78241785859c81d96e24e12dd36836b5c23df1fd
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:22:30 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:22:30 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78241785

Fix rebase lapack-multibuild to master conflict 3 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..39d360f 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -23,6 +24,8 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
+===
+>>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Denis Dupeyron]

commit: 7fcc36e404a535776e7d53f1e0bcac3e36a33f38
Author: Denis Dupeyron  gentoo  org>
AuthorDate: Fri Mar 27 20:24:53 2015 +
Commit: Denis Dupeyron  gentoo  org>
CommitDate: Fri Mar 27 20:24:53 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fcc36e4

sci-libs/openblas: version bump

 sci-libs/openblas/ChangeLog  |   7 +-
 sci-libs/openblas/openblas-0.2.14.ebuild | 227 +++
 2 files changed, 233 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index fee0835..1f27f12 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.14 (27 Mar 2015)
+
+  27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:
+  Version bump.
+
   20 Oct 2014; Mark Wright  openblas-.ebuild:
   Thanks to kiwifb for reporting
   https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )

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

[Justin Lecher]

commit: 471609fcab6425d25cb775092e422df83153b1b6
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:56:27 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:56:27 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=471609fc

sci-libs/openblas: Cleanup symlinks and files

 sci-libs/openblas/openblas-0.2.11.ebuild | 228 ++-
 sci-libs/openblas/openblas-0.2.14.ebuild | 228 +--
 2 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
deleted file mode 12
index 2381753..000
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(F

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

[Justin Lecher]

commit: 22c50b8ff81041b6f864a15b29a37f318eb3ba20
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:54:54 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:54:54 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=22c50b8f

sci-libs/openblas: Fix Bug 528974

Package-Manager: portage-2.2.14

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1f27f12..0912ff1 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2015; Marius Brehler  openblas-.ebuild:
+  Fix Bug 528974
+
 *openblas-0.2.14 (27 Mar 2015)
 
   27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a532fe8..db150b0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -48,7 +48,7 @@ get_openblas_flags() {
if use threads; then
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   openblas_flags+=" USE_OPENMP=1"
fi
local profname=$(fortran-int64_get_profname)
local libname="${profname//-/_}"

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

[Justin Lecher]

commit: 27ed0382803df0e13f89838353309dfd81f509a1
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Feb 21 15:15:57 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Feb 21 15:15:57 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=27ed0382

sci-libs/openblas: Build 32bit binaries using BINARY=32 as suggested by upstream

* Bump to EAPI=6

Github: Closes gentoo-science/sci#591

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 13 ++---
 sci-libs/openblas/openblas-0.2.15.ebuild | 13 ++---
 sci-libs/openblas/openblas-.ebuild   | 13 ++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 2dba543..b7bf4a2 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -65,7 +72,7 @@ get_openblas_abi_cflags() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

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

[Justin Lecher]

commit: 298eb745aa2dd2606616e821ae00cf0773d4d20d
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:54:43 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:54:43 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=298eb745

sci-libs/openblas: Inherit from eutils and multilib eclasses

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.15.ebuild | 2 +-
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 25ccea3..2dba543 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 git-r3 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils git-r3 multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

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

[Justin Lecher]

commit: b732e197ccd3fac26ad8fe3d74864688471b9128
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:53:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:53:04 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b732e197

sci-libs/openblas: Version Bump

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.15.ebuild | 193 +++
 1 file changed, 193 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
new file mode 100644
index 000..3a92aef
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NUMERIC_MODULE_NAME="openblas"
+
+inherit alternatives-2 numeric numeric-int64-multibuild
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+SRC_URI="
+   http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
+   http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+IUSE="dynamic openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=()
+   use dynamic && \
+   openblas_flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1 )
+   $(numeric-int64_is_int64_build) && \
+   openblas_flags+=( INTERFACE64=1 )
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
+   elif use openmp; then
+   openblas_flags+=( USE_OPENMP=1 )
+   fi
+   local profname=$(numeric-int64_get_module_name)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
+   fi
+   echo "${openblas_flags[@]}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=()
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1 )
+   else
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1 )
+   fi
+   $(numeric-int64_is_int64_build) && \
+   openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   echo "${openblas_abi_cflags[@]}"
+}
+
+src_unpack() {
+   default
+   find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+}
+
+src_prepare() {
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   numeric-int64-multibuild_copy_sources
+}
+
+src_configure() {
+   blas_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
+   -i Makefile.rule || die
+   }
+   numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir 
blas_configure
+}
+
+src_compile() {
+   # openblas already does multi-jobs
+   MAKEOPTS+=" -j1"
+   my_src_compile () {
+   local openblas_flags=$(get_openblas_flags)
+   # cflags already defined twice
+   unset CFLAGS || die
+   emake clean && emake libs shared ${openblas_flags}
+   mkdir -p libs && mv libopenblas* libs/ || die
+   # avoid pic when compiling static libraries, so re-compiling
+   if use static-libs; then
+   emake clean
+   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+   mv libopenblas* libs/ || die
+   fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+

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

[Justin Lecher]

commit: e9bbf6fa193ac1498c45c8af44663f5c97beff15
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:21:32 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:21:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9bbf6fa

sci-libs/openblas: Add missing eclass

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog  | 4 
 sci-libs/openblas/openblas-0.2.11.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.8.ebuild  | 4 ++--
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9723819..e783b9d 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  openblas-0.2.11.ebuild,
+  openblas-0.2.8.ebuild, openblas-.ebuild:
+  sci-libs/openblas: Add missing eclass
+
   06 Jun 2015; Justin Lecher  metadata.xml:
   sci-libs/openblas: Add github to remote-id in metadata.xml
 

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
index 2b5f76d..c69932e 100644
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

diff --git a/sci-libs/openblas/openblas-0.2.8.ebuild 
b/sci-libs/openblas/openblas-0.2.8.ebuild
index 96ca05b..565215b 100644
--- a/sci-libs/openblas/openblas-0.2.8.ebuild
+++ b/sci-libs/openblas/openblas-0.2.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-inherit eutils toolchain-funcs alternatives-2 multilib fortran-2
+inherit eutils multilib toolchain-funcs alternatives-2 multilib fortran-2
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index db150b0..c5166a3 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

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

[Justin Lecher]

commit: 2f8ff7d4e563d23bafad5eccd2c18d6ec5a5a343
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:19:52 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:19:52 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2f8ff7d4

sci-libs/openblas: Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/metadata.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 0912ff1..9723819 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  metadata.xml:
+  sci-libs/openblas: Add github to remote-id in metadata.xml
+
   02 Apr 2015; Marius Brehler  openblas-.ebuild:
   Fix Bug 528974
 

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 32441d1..6ef9b54 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -10,4 +10,7 @@
 Build the 64 bits integer library
 Build dynamic architecture detection at run time (for 
multi targets)
   
+  
+xianyi/OpenBLAS
+  
 

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

[Benda XU]

commit: 6538b395b3be07a04a76b3af9a7d6aa81df7f29d
Author: Benda Xu  gentoo  org>
AuthorDate: Fri Aug 25 06:28:30 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri Aug 25 06:28:30 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6538b395

sci-libs/openblas: fix DESTDIR and PREFIX for cmake directories.

Closes: https://github.com/gentoo/sci/pull/725

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.14-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.15-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.19-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.20.ebuild| 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
index 453be881f..ba7aa8298 100644
--- a/sci-libs/openblas/openblas-0.2.14-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
@@ -143,9 +143,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.15-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
index 64e2fb9c1..e4f0c89ed 100644
--- a/sci-libs/openblas/openblas-0.2.15-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
@@ -144,9 +144,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.19-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
index 81ed705fb..38378cecd 100644
--- a/sci-libs/openblas/openblas-0.2.19-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
@@ -149,9 +149,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index 4686f4890..c15c6eb73 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -146,9 +146,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

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

[Benda XU]

commit: 0e143007295f7fe3fe1b5f9506817216d5eb80e2
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Aug 28 07:37:03 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Aug 28 07:37:03 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0e143007

sci-libs/openblas: USE flags of single-threaded version.

  When neither openmp nor threads USE flag is set, OpenBLAS
  should build a single-threaded version with make option
  USE_THREAD=0.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.20.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index c15c6eb73..838c334d6 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -40,6 +40,8 @@ get_openblas_flags() {
openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
elif use openmp; then
openblas_flags+=( USE_OPENMP=1 )
+   else
+   openblas_flags+=( USE_THREAD=0 ) # single-threaded
fi
local profname=$(numeric-int64_get_module_name)
local libname="${profname//-/_}"

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

[Justin Lecher]

commit: 87bd5dfcf80bd28990815fc776575a4244b9c1aa
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Apr 30 10:25:29 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Apr 30 10:25:29 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=87bd5dfc

sci-libs/openblas: Drop ppc64 support

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/metadata.xml   | 2 +-
 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 1f64b9df9..2bf0b4229 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 3ff5f8502..49d011ead 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

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

[Benda XU]

commit: d5ac214327ad893643c77adf474305c8a12cb09a
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun  6 04:06:32 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun  6 04:11:34 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5ac2143

sci-libs/openblas: remove redundant libdir from Libs in .pc

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 1993df94a..c44cd74c9 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -168,7 +168,7 @@ src_install() {
 
create_pkgconfig \
--name "${profname}" \
-   --libs "-L\${libdir} -l${libname}" \
+   --libs "-l${libname}" \
--libs-private "-lm" \
--cflags "-I\${includedir}/${PN} 
${openblas_abi_cflags}" \
${profname}

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

[Benda XU]

commit: d10535319c19d2e0e4fad56ebeed85ad874eb980
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Apr  2 04:16:28 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Apr  2 04:18:16 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d1053531

sci-libs/openblas: advise openmp cflags in pkg-config.

 sci-libs/openblas/openblas-0.2.15.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 6dc5fd3c2..c419d8974 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -67,6 +67,7 @@ get_openblas_abi_cflags() {
fi
$(numeric-int64_is_int64_build) && \
openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   use openmp && openblas_abi_cflags+=( -fopenmp )
echo "${openblas_abi_cflags[@]}"
 }
 

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

[Justin Lecher]

commit: 471609fcab6425d25cb775092e422df83153b1b6
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:56:27 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:56:27 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=471609fc

sci-libs/openblas: Cleanup symlinks and files

 sci-libs/openblas/openblas-0.2.11.ebuild | 228 ++-
 sci-libs/openblas/openblas-0.2.14.ebuild | 228 +--
 2 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
deleted file mode 12
index 2381753..000
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(F

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

[Justin Lecher]

commit: 22c50b8ff81041b6f864a15b29a37f318eb3ba20
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:54:54 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:54:54 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=22c50b8f

sci-libs/openblas: Fix Bug 528974

Package-Manager: portage-2.2.14

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1f27f12..0912ff1 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2015; Marius Brehler  openblas-.ebuild:
+  Fix Bug 528974
+
 *openblas-0.2.14 (27 Mar 2015)
 
   27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a532fe8..db150b0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -48,7 +48,7 @@ get_openblas_flags() {
if use threads; then
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   openblas_flags+=" USE_OPENMP=1"
fi
local profname=$(fortran-int64_get_profname)
local libname="${profname//-/_}"

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

[Denis Dupeyron]

commit: 7fcc36e404a535776e7d53f1e0bcac3e36a33f38
Author: Denis Dupeyron  gentoo  org>
AuthorDate: Fri Mar 27 20:24:53 2015 +
Commit: Denis Dupeyron  gentoo  org>
CommitDate: Fri Mar 27 20:24:53 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fcc36e4

sci-libs/openblas: version bump

 sci-libs/openblas/ChangeLog  |   7 +-
 sci-libs/openblas/openblas-0.2.14.ebuild | 227 +++
 2 files changed, 233 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index fee0835..1f27f12 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.14 (27 Mar 2015)
+
+  27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:
+  Version bump.
+
   20 Oct 2014; Mark Wright  openblas-.ebuild:
   Thanks to kiwifb for reporting
   https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )

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

[Justin Lecher]

commit: 27ed0382803df0e13f89838353309dfd81f509a1
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Feb 21 15:15:57 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Feb 21 15:15:57 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=27ed0382

sci-libs/openblas: Build 32bit binaries using BINARY=32 as suggested by upstream

* Bump to EAPI=6

Github: Closes gentoo-science/sci#591

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 13 ++---
 sci-libs/openblas/openblas-0.2.15.ebuild | 13 ++---
 sci-libs/openblas/openblas-.ebuild   | 13 ++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 2dba543..b7bf4a2 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -65,7 +72,7 @@ get_openblas_abi_cflags() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

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

[Justin Lecher]

commit: 298eb745aa2dd2606616e821ae00cf0773d4d20d
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:54:43 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:54:43 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=298eb745

sci-libs/openblas: Inherit from eutils and multilib eclasses

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.15.ebuild | 2 +-
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 25ccea3..2dba543 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 git-r3 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils git-r3 multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

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

[Justin Lecher]

commit: b732e197ccd3fac26ad8fe3d74864688471b9128
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:53:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:53:04 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b732e197

sci-libs/openblas: Version Bump

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.15.ebuild | 193 +++
 1 file changed, 193 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
new file mode 100644
index 000..3a92aef
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NUMERIC_MODULE_NAME="openblas"
+
+inherit alternatives-2 numeric numeric-int64-multibuild
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+SRC_URI="
+   http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
+   http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+IUSE="dynamic openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=()
+   use dynamic && \
+   openblas_flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1 )
+   $(numeric-int64_is_int64_build) && \
+   openblas_flags+=( INTERFACE64=1 )
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
+   elif use openmp; then
+   openblas_flags+=( USE_OPENMP=1 )
+   fi
+   local profname=$(numeric-int64_get_module_name)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
+   fi
+   echo "${openblas_flags[@]}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=()
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1 )
+   else
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1 )
+   fi
+   $(numeric-int64_is_int64_build) && \
+   openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   echo "${openblas_abi_cflags[@]}"
+}
+
+src_unpack() {
+   default
+   find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+}
+
+src_prepare() {
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   numeric-int64-multibuild_copy_sources
+}
+
+src_configure() {
+   blas_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
+   -i Makefile.rule || die
+   }
+   numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir 
blas_configure
+}
+
+src_compile() {
+   # openblas already does multi-jobs
+   MAKEOPTS+=" -j1"
+   my_src_compile () {
+   local openblas_flags=$(get_openblas_flags)
+   # cflags already defined twice
+   unset CFLAGS || die
+   emake clean && emake libs shared ${openblas_flags}
+   mkdir -p libs && mv libopenblas* libs/ || die
+   # avoid pic when compiling static libraries, so re-compiling
+   if use static-libs; then
+   emake clean
+   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+   mv libopenblas* libs/ || die
+   fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+

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

[Justin Lecher]

commit: e9bbf6fa193ac1498c45c8af44663f5c97beff15
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:21:32 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:21:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9bbf6fa

sci-libs/openblas: Add missing eclass

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog  | 4 
 sci-libs/openblas/openblas-0.2.11.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.8.ebuild  | 4 ++--
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9723819..e783b9d 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  openblas-0.2.11.ebuild,
+  openblas-0.2.8.ebuild, openblas-.ebuild:
+  sci-libs/openblas: Add missing eclass
+
   06 Jun 2015; Justin Lecher  metadata.xml:
   sci-libs/openblas: Add github to remote-id in metadata.xml
 

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
index 2b5f76d..c69932e 100644
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

diff --git a/sci-libs/openblas/openblas-0.2.8.ebuild 
b/sci-libs/openblas/openblas-0.2.8.ebuild
index 96ca05b..565215b 100644
--- a/sci-libs/openblas/openblas-0.2.8.ebuild
+++ b/sci-libs/openblas/openblas-0.2.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-inherit eutils toolchain-funcs alternatives-2 multilib fortran-2
+inherit eutils multilib toolchain-funcs alternatives-2 multilib fortran-2
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index db150b0..c5166a3 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

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

[Justin Lecher]

commit: 2f8ff7d4e563d23bafad5eccd2c18d6ec5a5a343
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:19:52 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:19:52 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2f8ff7d4

sci-libs/openblas: Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/metadata.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 0912ff1..9723819 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  metadata.xml:
+  sci-libs/openblas: Add github to remote-id in metadata.xml
+
   02 Apr 2015; Marius Brehler  openblas-.ebuild:
   Fix Bug 528974
 

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 32441d1..6ef9b54 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -10,4 +10,7 @@
 Build the 64 bits integer library
 Build dynamic architecture detection at run time (for 
multi targets)
   
+  
+xianyi/OpenBLAS
+  
 

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

[Benda XU]

commit: 6538b395b3be07a04a76b3af9a7d6aa81df7f29d
Author: Benda Xu  gentoo  org>
AuthorDate: Fri Aug 25 06:28:30 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri Aug 25 06:28:30 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6538b395

sci-libs/openblas: fix DESTDIR and PREFIX for cmake directories.

Closes: https://github.com/gentoo/sci/pull/725

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.14-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.15-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.19-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.20.ebuild| 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
index 453be881f..ba7aa8298 100644
--- a/sci-libs/openblas/openblas-0.2.14-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
@@ -143,9 +143,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.15-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
index 64e2fb9c1..e4f0c89ed 100644
--- a/sci-libs/openblas/openblas-0.2.15-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
@@ -144,9 +144,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.19-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
index 81ed705fb..38378cecd 100644
--- a/sci-libs/openblas/openblas-0.2.19-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
@@ -149,9 +149,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index 4686f4890..c15c6eb73 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -146,9 +146,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

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

[Benda XU]

commit: 0e143007295f7fe3fe1b5f9506817216d5eb80e2
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Aug 28 07:37:03 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Aug 28 07:37:03 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0e143007

sci-libs/openblas: USE flags of single-threaded version.

  When neither openmp nor threads USE flag is set, OpenBLAS
  should build a single-threaded version with make option
  USE_THREAD=0.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.20.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index c15c6eb73..838c334d6 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -40,6 +40,8 @@ get_openblas_flags() {
openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
elif use openmp; then
openblas_flags+=( USE_OPENMP=1 )
+   else
+   openblas_flags+=( USE_THREAD=0 ) # single-threaded
fi
local profname=$(numeric-int64_get_module_name)
local libname="${profname//-/_}"

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

[Justin Lecher]

commit: 87bd5dfcf80bd28990815fc776575a4244b9c1aa
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Apr 30 10:25:29 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Apr 30 10:25:29 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=87bd5dfc

sci-libs/openblas: Drop ppc64 support

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/metadata.xml   | 2 +-
 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 1f64b9df9..2bf0b4229 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 3ff5f8502..49d011ead 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

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

[Benda XU]

commit: d5ac214327ad893643c77adf474305c8a12cb09a
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun  6 04:06:32 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun  6 04:11:34 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5ac2143

sci-libs/openblas: remove redundant libdir from Libs in .pc

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 1993df94a..c44cd74c9 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -168,7 +168,7 @@ src_install() {
 
create_pkgconfig \
--name "${profname}" \
-   --libs "-L\${libdir} -l${libname}" \
+   --libs "-l${libname}" \
--libs-private "-lm" \
--cflags "-I\${includedir}/${PN} 
${openblas_abi_cflags}" \
${profname}

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

[Benda XU]

commit: d10535319c19d2e0e4fad56ebeed85ad874eb980
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Apr  2 04:16:28 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Apr  2 04:18:16 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d1053531

sci-libs/openblas: advise openmp cflags in pkg-config.

 sci-libs/openblas/openblas-0.2.15.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 6dc5fd3c2..c419d8974 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -67,6 +67,7 @@ get_openblas_abi_cflags() {
fi
$(numeric-int64_is_int64_build) && \
openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   use openmp && openblas_abi_cflags+=( -fopenmp )
echo "${openblas_abi_cflags[@]}"
 }
 

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

[Justin Lecher]

commit: 298eb745aa2dd2606616e821ae00cf0773d4d20d
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:54:43 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:54:43 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=298eb745

sci-libs/openblas: Inherit from eutils and multilib eclasses

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.15.ebuild | 2 +-
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 25ccea3..2dba543 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 git-r3 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils git-r3 multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

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

[Justin Lecher]

commit: b732e197ccd3fac26ad8fe3d74864688471b9128
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 09:53:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 09:53:04 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b732e197

sci-libs/openblas: Version Bump

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.15.ebuild | 193 +++
 1 file changed, 193 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
new file mode 100644
index 000..3a92aef
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NUMERIC_MODULE_NAME="openblas"
+
+inherit alternatives-2 numeric numeric-int64-multibuild
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+SRC_URI="
+   http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
+   http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+IUSE="dynamic openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=()
+   use dynamic && \
+   openblas_flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1 )
+   $(numeric-int64_is_int64_build) && \
+   openblas_flags+=( INTERFACE64=1 )
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
+   elif use openmp; then
+   openblas_flags+=( USE_OPENMP=1 )
+   fi
+   local profname=$(numeric-int64_get_module_name)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
+   fi
+   echo "${openblas_flags[@]}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=()
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1 )
+   else
+   openblas_abi_cflags=( -DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1 )
+   fi
+   $(numeric-int64_is_int64_build) && \
+   openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   echo "${openblas_abi_cflags[@]}"
+}
+
+src_unpack() {
+   default
+   find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+}
+
+src_prepare() {
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   numeric-int64-multibuild_copy_sources
+}
+
+src_configure() {
+   blas_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
+   -i Makefile.rule || die
+   }
+   numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir 
blas_configure
+}
+
+src_compile() {
+   # openblas already does multi-jobs
+   MAKEOPTS+=" -j1"
+   my_src_compile () {
+   local openblas_flags=$(get_openblas_flags)
+   # cflags already defined twice
+   unset CFLAGS || die
+   emake clean && emake libs shared ${openblas_flags}
+   mkdir -p libs && mv libopenblas* libs/ || die
+   # avoid pic when compiling static libraries, so re-compiling
+   if use static-libs; then
+   emake clean
+   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+   mv libopenblas* libs/ || die
+   fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+

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

[Justin Lecher]

commit: e9bbf6fa193ac1498c45c8af44663f5c97beff15
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:21:32 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:21:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9bbf6fa

sci-libs/openblas: Add missing eclass

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog  | 4 
 sci-libs/openblas/openblas-0.2.11.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.8.ebuild  | 4 ++--
 sci-libs/openblas/openblas-.ebuild   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9723819..e783b9d 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  openblas-0.2.11.ebuild,
+  openblas-0.2.8.ebuild, openblas-.ebuild:
+  sci-libs/openblas: Add missing eclass
+
   06 Jun 2015; Justin Lecher  metadata.xml:
   sci-libs/openblas: Add github to remote-id in metadata.xml
 

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
index 2b5f76d..c69932e 100644
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

diff --git a/sci-libs/openblas/openblas-0.2.8.ebuild 
b/sci-libs/openblas/openblas-0.2.8.ebuild
index 96ca05b..565215b 100644
--- a/sci-libs/openblas/openblas-0.2.8.ebuild
+++ b/sci-libs/openblas/openblas-0.2.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-inherit eutils toolchain-funcs alternatives-2 multilib fortran-2
+inherit eutils multilib toolchain-funcs alternatives-2 multilib fortran-2
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index db150b0..c5166a3 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
 if [[ ${PV} == "" ]] ; then

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

[Justin Lecher]

commit: 2f8ff7d4e563d23bafad5eccd2c18d6ec5a5a343
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jun  6 10:19:52 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jun  6 10:19:52 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2f8ff7d4

sci-libs/openblas: Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/metadata.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 0912ff1..9723819 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher  metadata.xml:
+  sci-libs/openblas: Add github to remote-id in metadata.xml
+
   02 Apr 2015; Marius Brehler  openblas-.ebuild:
   Fix Bug 528974
 

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 32441d1..6ef9b54 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -10,4 +10,7 @@
 Build the 64 bits integer library
 Build dynamic architecture detection at run time (for 
multi targets)
   
+  
+xianyi/OpenBLAS
+  
 

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

[Justin Lecher]

commit: 27ed0382803df0e13f89838353309dfd81f509a1
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Feb 21 15:15:57 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Feb 21 15:15:57 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=27ed0382

sci-libs/openblas: Build 32bit binaries using BINARY=32 as suggested by upstream

* Bump to EAPI=6

Github: Closes gentoo-science/sci#591

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 13 ++---
 sci-libs/openblas/openblas-0.2.15.ebuild | 13 ++---
 sci-libs/openblas/openblas-.ebuild   | 13 ++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 2dba543..b7bf4a2 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+   "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
local openblas_flags=()
use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
local libnamesuffix="${underscoresuffix#_}"
openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
fi
+
+   [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
echo "${openblas_flags[@]}"
 }
 
@@ -65,7 +72,7 @@ get_openblas_abi_cflags() {
 }
 
 src_prepare() {
-   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   default
 
# lapack and lapacke are not modified from upstream lapack
sed \

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

[Benda XU]

commit: 6538b395b3be07a04a76b3af9a7d6aa81df7f29d
Author: Benda Xu  gentoo  org>
AuthorDate: Fri Aug 25 06:28:30 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri Aug 25 06:28:30 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6538b395

sci-libs/openblas: fix DESTDIR and PREFIX for cmake directories.

Closes: https://github.com/gentoo/sci/pull/725

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.14-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.15-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.19-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.20.ebuild| 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
index 453be881f..ba7aa8298 100644
--- a/sci-libs/openblas/openblas-0.2.14-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
@@ -143,9 +143,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.15-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
index 64e2fb9c1..e4f0c89ed 100644
--- a/sci-libs/openblas/openblas-0.2.15-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
@@ -144,9 +144,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.19-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
index 81ed705fb..38378cecd 100644
--- a/sci-libs/openblas/openblas-0.2.19-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
@@ -149,9 +149,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index 4686f4890..c15c6eb73 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -146,9 +146,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

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

[Benda XU]

commit: 0e143007295f7fe3fe1b5f9506817216d5eb80e2
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Aug 28 07:37:03 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Aug 28 07:37:03 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0e143007

sci-libs/openblas: USE flags of single-threaded version.

  When neither openmp nor threads USE flag is set, OpenBLAS
  should build a single-threaded version with make option
  USE_THREAD=0.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.20.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index c15c6eb73..838c334d6 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -40,6 +40,8 @@ get_openblas_flags() {
openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
elif use openmp; then
openblas_flags+=( USE_OPENMP=1 )
+   else
+   openblas_flags+=( USE_THREAD=0 ) # single-threaded
fi
local profname=$(numeric-int64_get_module_name)
local libname="${profname//-/_}"

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

[Justin Lecher]

commit: 87bd5dfcf80bd28990815fc776575a4244b9c1aa
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Apr 30 10:25:29 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Apr 30 10:25:29 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=87bd5dfc

sci-libs/openblas: Drop ppc64 support

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/metadata.xml   | 2 +-
 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 1f64b9df9..2bf0b4229 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 3ff5f8502..49d011ead 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

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

[Benda XU]

commit: d5ac214327ad893643c77adf474305c8a12cb09a
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun  6 04:06:32 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun  6 04:11:34 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5ac2143

sci-libs/openblas: remove redundant libdir from Libs in .pc

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 1993df94a..c44cd74c9 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -168,7 +168,7 @@ src_install() {
 
create_pkgconfig \
--name "${profname}" \
-   --libs "-L\${libdir} -l${libname}" \
+   --libs "-l${libname}" \
--libs-private "-lm" \
--cflags "-I\${includedir}/${PN} 
${openblas_abi_cflags}" \
${profname}

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

[Benda XU]

commit: d10535319c19d2e0e4fad56ebeed85ad874eb980
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Apr  2 04:16:28 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Apr  2 04:18:16 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d1053531

sci-libs/openblas: advise openmp cflags in pkg-config.

 sci-libs/openblas/openblas-0.2.15.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 6dc5fd3c2..c419d8974 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -67,6 +67,7 @@ get_openblas_abi_cflags() {
fi
$(numeric-int64_is_int64_build) && \
openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   use openmp && openblas_abi_cflags+=( -fopenmp )
echo "${openblas_abi_cflags[@]}"
 }
 

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

[Justin Lecher]

commit: 5b5e9e7d6c21a48ad35d3fc033902201a71a06d4
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 18 14:01:11 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:05:57 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b5e9e7d

multibuild openblas when USE=int64 is specified.

---
 sci-libs/openblas/ChangeLog|   3 +
 sci-libs/openblas/openblas-.ebuild | 221 +
 2 files changed, 142 insertions(+), 82 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index caf34f2..b4f5886 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2014; Mark Wright  openblas-.ebuild:
+  multibuild openblas when USE=int64 is specified.
+
   06 Jan 2014; Justin Lecher  openblas-.ebuild,
   metadata.xml:
   Switch from git-2 to git-r3

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 618c03b..3bd158a 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit alternatives-2 eutils fortran-2 git-r3 multilib toolchain-funcs
+inherit alternatives-2 eutils fortran-2 git-r3 multilib multibuild 
toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
@@ -14,105 +14,162 @@ EGIT_BRANCH="develop"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="int64 dynamic openmp static-libs threads"
+IUSE="dynamic int64 openmp static-libs threads"
 KEYWORDS=""
 
-src_configure() {
-   # lapack and lapacke are not modified from upstream lapack
-   sed \
-   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
-   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-   -i Makefile.rule || die
-}
-
-openblas_compile() {
-   local profname=$1
-   einfo "Compiling profile ${profname}"
-   # cflags already defined twice
-   unset CFLAGS
-   emake clean
-   emake libs shared ${openblas_flags}
-   mkdir -p libs && mv libopenblas* libs/
-   # avoid pic when compiling static libraries, so re-compiling
-   if use static-libs; then
-   emake clean
-   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-   mv libopenblas* libs/
-   fi
-   cat <<-EOF > ${profname}.pc
-   prefix=${EPREFIX}/usr
-   libdir=\${prefix}/$(get_libdir)
-   includedir=\${prefix}/include
-   Name: ${PN}
-   Description: ${DESCRIPTION}
-   Version: ${PV}
-   URL: ${HOMEPAGE}
-   Libs: -L\${libdir} -lopenblas
-   Libs.private: -lm
-   Cflags: -I\${includedir}/${PN}
-   EOF
-}
+INT64_SUFFIX="int64"
+BASE_PROFNAME="openblas"
 
-src_compile() {
-   # openblas already does multi-jobs
-   MAKEOPTS+=" -j1"
-   openblas_flags=""
-   local openblas_name=openblas
+get_openblas_flags() {
+   local openblas_flags=""
use dynamic && \
-   openblas_name+="-dynamic" && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
-   use int64 && \
-   openblas_name+="-int64" && \
-   openblas_flags+=" INTERFACE64=1"
-
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   fi
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
-   openblas_name+="-threads"
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_name+="-openmp"
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
-   openblas_compile ${openblas_name}
-   mv libs/libopenblas* . || die
+   echo "${openblas_flags}"
+}
+
+get_profname() {
+   local profname="${BASE_PROFNAME}"
+   use dynamic && \
+   profname+="-dynamic"
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   profname+="-${INT64_SUFFIX}"
+   fi
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   profname+="-threads"
+   elif use openmp; then
+   profname+="-openmp"
+   fi
+   echo "${profname}"
+}
+
+pkg_setup() {
+   # The file /usr/include/openblas/openblas_config.h is generated during 
the install.
+   # By list

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

[Justin Lecher]

commit: f487803ec21a1ee723327b55fa10292146fe1d2c
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:28:21 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:28:21 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f487803e

Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 39d360f..9f9c82e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,7 +2,6 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -24,8 +23,6 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
-===
->>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Justin Lecher]

commit: 0cc5ee5acce2af5afeacb555efb5f1aa3a64c379
Author: gienah  gentoo  org>
AuthorDate: Wed Feb 19 10:16:43 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cc5ee5a

Thanks to sfabbro: dodoc should be outside the function, they do not change

---
 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index b4f5886..68e0955 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2014; Mark Wright  openblas-.ebuild:
+  Thanks to sfabbro: dodoc should be outside the function, they do not change
+
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 3bd158a..3e3cd52 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -158,9 +158,6 @@ src_install() {
doins ${pcfile}
done
 
-   dodoc 
GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-   dodoc *md Changelog.txt
-
if [[ ${CHOST} == *-darwin* ]] ; then
cd "${ED}"/usr/$(get_libdir)
local d
@@ -172,4 +169,7 @@ src_install() {
fi
}
multibuild_foreach_variant run_in_build_dir my_src_install
+
+   dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+   dodoc *md Changelog.txt
 }

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

[Justin Lecher]

commit: fbdfad7d139533e2e0d3b6993685b75772823f07
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 13 01:02:57 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:40:42 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fbdfad7d

Remove the setting of the FC and F77 environment variables, instead sed the 
COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add 
get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the 
pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the 
defines, then remove the OPENBLAS_ at the start, and sed these into COMMON_OPT 
in Makefile.rule, as USE64BITINT was removed by the patch 
openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is required 
to ensure the openblas_config.h header file is the same between ABIs.

---
 sci-libs/openblas/ChangeLog| 11 
 sci-libs/openblas/openblas-.ebuild | 50 --
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..bb794f4 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Sep 2014; Mark Wright  openblas-.ebuild:
+  Remove the setting of the FC and F77 environment variables, instead sed the
+  COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add
+  get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the
+  pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the
+  defines, then remove the OPENBLAS_ at the start, and sed these into
+  COMMON_OPT in Makefile.rule, as USE64BITINT was removed by the patch
+  openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is
+  required to ensure the openblas_config.h header file is the same between
+  ABIs.
+
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index b3854fe..61ddcf0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -55,6 +55,27 @@ get_openblas_flags() {
echo "${openblas_flags}"
 }
 
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   fi
+   echo "${openblas_abi_cflags}"
+}
+
+get_openblas_abi_fflags() {
+   local openblas_abi_fflags=""
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_fflags+="-fdefault-integer-8"
+   fi
+   echo "${openblas_abi_fflags}"
+}
+
 get_profname() {
local profname="${BASE_PROFNAME}"
use dynamic && \
@@ -118,8 +139,6 @@ _int64_multilib_multibuild_wrapper() {
 
local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -167,10 +186,12 @@ src_prepare() {
 src_configure() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
sed \
-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
-i Makefile.rule || die
}
multibuild_foreach_variant run_in_build_dir 
_int64_multilib_multibuild_wrapper my_configure
@@ -207,23 +228,12 @@ src_compile() {
Libs: -L\${libdir} -l${libname}
Libs.private: -lm
EOF
-   local openblas_abi_defs=""
-   if [[ "${ABI}" == "x86" ]]; then
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
-   else
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
-   fi
-   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   cat <<-EOF >> ${profname}.pc
-  

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

[Justin Lecher]

commit: 76559c8bbd22f9fa2093008c96a0948c95e2a7f3
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 25 13:44:08 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=76559c8b

openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI

---
 sci-libs/openblas/openblas-.ebuild | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 1c2b6c6..f012efd 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() {
# will be overwritten by the normal variant in the install, which 
removes the
# #define OPENBLAS_USE64BITINT for us.  We then specify it in Cflags in 
the
# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+   local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
local MULTIBUILD_VARIANTS=( )
-   use int64 && \
-   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
-   MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) )
-   echo "${MULTIBUILD_VARIANTS[*]}"
+   for i in "${MULTILIB_VARIANTS[@]}"; do
+   if use int64 && [[ "${i}" =~ 64$ ]]; then
+   MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
+   fi
+   MULTIBUILD_VARIANTS+=( "${i}" )
+   done
+   echo "${MULTIBUILD_VARIANTS[@]}"
 }
 
 # @FUNCTION: _int64_multilib_multibuild_wrapper
@@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() {
 _int64_multilib_multibuild_wrapper() {
debug-print-function ${FUNCNAME} "${@}"
 
-   if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   local ABI=${MULTIBUILD_VARIANT}
-   multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
-   fi
+   local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
+   multilib_toolchain_setup "${ABI}"
+   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
+   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -191,7 +193,7 @@ src_test() {
 
 src_install() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
-   my_src_install () {
+   my_src_install() {
local openblas_flags=$(get_openblas_flags)
local profname=$(get_profname)
local pcfile

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

[Justin Lecher]

commit: 78241785859c81d96e24e12dd36836b5c23df1fd
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:22:30 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:22:30 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78241785

Fix rebase lapack-multibuild to master conflict 3 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..39d360f 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -23,6 +24,8 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
+===
+>>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Mark Wright]

commit: 800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 05:54:59 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 05:54:59 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=800e8d3b

Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler 
messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')', 
thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for reporting. The 
problem was that applying the 
-0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare() 
causes build failures on assembler code as the assembler does not understand 
sizeof(float). So delay applying the patch until src_install(). Bump openblas 
to 0.2.12.

---
 sci-libs/openblas/ChangeLog  | 13 +
 sci-libs/openblas/openblas-0.2.12.ebuild |  1 +
 sci-libs/openblas/openblas-.ebuild   |  9 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1af5fd9..1ad0bed 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.12 (19 Oct 2014)
+
+  19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,
+  openblas-.ebuild:
+  Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler
+  messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing
+  ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for
+  reporting. The problem was that applying the
+  -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare()
+  causes build failures on assembler code as the assembler does not understand
+  sizeof(float). So delay applying the patch until src_install(). Bump openblas
+  to 0.2.12.
+
   13 Oct 2014; Mark Wright  openblas-.ebuild:
   Refactor openblas to use the fortran-int64.eclass. Move the virtuals from
   RDEPEND to PDEPEND to avoid circular dependencies. Specify the pkg-config

diff --git a/sci-libs/openblas/openblas-0.2.12.ebuild 
b/sci-libs/openblas/openblas-0.2.12.ebuild
new file mode 12
index 000..2381753
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.12.ebuild
@@ -0,0 +1 @@
+openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a33e449..5843200 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -80,10 +80,9 @@ src_unpack() {
 src_prepare() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
-   if [[ ${PV} != "" ]] ; then
+   if [[ ${PV} == "0.2.11" ]] ; then
epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
fi
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
# lapack and lapacke are not modified from upstream lapack
sed \
-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
@@ -160,6 +159,12 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until src_install().
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: c035b265ecc77dbab84a3492829d7de9a0c217e3
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 10:20:52 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 10:20:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c035b265

The fix for Bug 524612 failed in src_install building openblas from git. The 
fix is to move applying the patch to src_compile after building the library, 
then remove config.h and config_last.h; make config.h - ignoring the spurious 
warning; then cp config.h to config_last.h.

---
 sci-libs/openblas/ChangeLog|  6 ++
 sci-libs/openblas/openblas-.ebuild | 16 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1ad0bed..cc7349a 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2014; Mark Wright  openblas-.ebuild:
+  The fix for Bug 524612 failed in src_install building openblas from git. The
+  fix is to move applying the patch to src_compile after building the library,
+  then remove config.h and config_last.h; make config.h - ignoring the spurious
+  warning; then cp config.h to config_last.h.
+
 *openblas-0.2.12 (19 Oct 2014)
 
   19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 5843200..7c22ca6 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -125,6 +125,16 @@ src_compile() {
emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
mv libopenblas* libs/
fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until after building the libraries.
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+   rm -f config.h config_last.h
+   # Note: prints this spurious warning: make: Nothing to be done 
for 'config.h'.
+   emake config.h
+   cp config.h config_last.h || die
cat <<-EOF > ${profname}.pc
prefix=${EPREFIX}/usr
libdir=\${prefix}/$(get_libdir)
@@ -159,12 +169,6 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
-   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
-   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
-   # The problem is applying this patch in src_prepare() causes 
build failures on
-   # assembler code as the assembler does not understand 
sizeof(float).  So
-   # delay applying the patch until src_install().
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: 08e04d6e9d0357253d1ea001d7c957a74e537384
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Mon Oct 20 12:31:36 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08e04d6e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Justin Lecher]

commit: beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 20 12:34:54 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=beb6c45e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Justin Lecher]

commit: 87bd5dfcf80bd28990815fc776575a4244b9c1aa
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Apr 30 10:25:29 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Apr 30 10:25:29 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=87bd5dfc

sci-libs/openblas: Drop ppc64 support

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/openblas/metadata.xml   | 2 +-
 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 1f64b9df9..2bf0b4229 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 3ff5f8502..49d011ead 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

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

[Benda XU]

commit: 6538b395b3be07a04a76b3af9a7d6aa81df7f29d
Author: Benda Xu  gentoo  org>
AuthorDate: Fri Aug 25 06:28:30 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri Aug 25 06:28:30 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6538b395

sci-libs/openblas: fix DESTDIR and PREFIX for cmake directories.

Closes: https://github.com/gentoo/sci/pull/725

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.14-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.15-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.19-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.20.ebuild| 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
index 453be881f..ba7aa8298 100644
--- a/sci-libs/openblas/openblas-0.2.14-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
@@ -143,9 +143,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.15-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
index 64e2fb9c1..e4f0c89ed 100644
--- a/sci-libs/openblas/openblas-0.2.15-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
@@ -144,9 +144,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.19-r1.ebuild 
b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
index 81ed705fb..38378cecd 100644
--- a/sci-libs/openblas/openblas-0.2.19-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
@@ -149,9 +149,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index 4686f4890..c15c6eb73 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -146,9 +146,9 @@ src_install() {
-i config_last.h \
|| die "Could not ensure there is no definition of 
USE64BITINT in config_last.h"
emake install \
-   PREFIX="${ED}"usr ${openblas_flags} \
-   OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-   OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+   DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+   OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+   OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
if ! use static-libs; then
rm "${ED}"usr/$(get_libdir)/lib*.a || die
fi

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

[Benda XU]

commit: 0e143007295f7fe3fe1b5f9506817216d5eb80e2
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Aug 28 07:37:03 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Aug 28 07:37:03 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0e143007

sci-libs/openblas: USE flags of single-threaded version.

  When neither openmp nor threads USE flag is set, OpenBLAS
  should build a single-threaded version with make option
  USE_THREAD=0.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.20.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild 
b/sci-libs/openblas/openblas-0.2.20.ebuild
index c15c6eb73..838c334d6 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -40,6 +40,8 @@ get_openblas_flags() {
openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
elif use openmp; then
openblas_flags+=( USE_OPENMP=1 )
+   else
+   openblas_flags+=( USE_THREAD=0 ) # single-threaded
fi
local profname=$(numeric-int64_get_module_name)
local libname="${profname//-/_}"

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

[Benda XU]

commit: d5ac214327ad893643c77adf474305c8a12cb09a
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Jun  6 04:06:32 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun  6 04:11:34 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5ac2143

sci-libs/openblas: remove redundant libdir from Libs in .pc

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild 
b/sci-libs/openblas/openblas-0.2.19.ebuild
index 1993df94a..c44cd74c9 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -168,7 +168,7 @@ src_install() {
 
create_pkgconfig \
--name "${profname}" \
-   --libs "-L\${libdir} -l${libname}" \
+   --libs "-l${libname}" \
--libs-private "-lm" \
--cflags "-I\${includedir}/${PN} 
${openblas_abi_cflags}" \
${profname}

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

[Benda XU]

commit: d10535319c19d2e0e4fad56ebeed85ad874eb980
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Apr  2 04:16:28 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Apr  2 04:18:16 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d1053531

sci-libs/openblas: advise openmp cflags in pkg-config.

 sci-libs/openblas/openblas-0.2.15.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 6dc5fd3c2..c419d8974 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -67,6 +67,7 @@ get_openblas_abi_cflags() {
fi
$(numeric-int64_is_int64_build) && \
openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+   use openmp && openblas_abi_cflags+=( -fopenmp )
echo "${openblas_abi_cflags[@]}"
 }
 

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

[Justin Lecher]

commit: 471609fcab6425d25cb775092e422df83153b1b6
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:56:27 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:56:27 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=471609fc

sci-libs/openblas: Cleanup symlinks and files

 sci-libs/openblas/openblas-0.2.11.ebuild | 228 ++-
 sci-libs/openblas/openblas-0.2.14.ebuild | 228 +--
 2 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
deleted file mode 12
index 2381753..000
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild 
b/sci-libs/openblas/openblas-0.2.11.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+   sed \
+   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
+   -e "s:^#\s*\(F

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

[Justin Lecher]

commit: 22c50b8ff81041b6f864a15b29a37f318eb3ba20
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Apr  2 09:54:54 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Apr  2 09:54:54 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=22c50b8f

sci-libs/openblas: Fix Bug 528974

Package-Manager: portage-2.2.14

 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1f27f12..0912ff1 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2015; Marius Brehler  openblas-.ebuild:
+  Fix Bug 528974
+
 *openblas-0.2.14 (27 Mar 2015)
 
   27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a532fe8..db150b0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -48,7 +48,7 @@ get_openblas_flags() {
if use threads; then
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   openblas_flags+=" USE_OPENMP=1"
fi
local profname=$(fortran-int64_get_profname)
local libname="${profname//-/_}"

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

[Denis Dupeyron]

commit: 7fcc36e404a535776e7d53f1e0bcac3e36a33f38
Author: Denis Dupeyron  gentoo  org>
AuthorDate: Fri Mar 27 20:24:53 2015 +
Commit: Denis Dupeyron  gentoo  org>
CommitDate: Fri Mar 27 20:24:53 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fcc36e4

sci-libs/openblas: version bump

 sci-libs/openblas/ChangeLog  |   7 +-
 sci-libs/openblas/openblas-0.2.14.ebuild | 227 +++
 2 files changed, 233 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index fee0835..1f27f12 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.14 (27 Mar 2015)
+
+  27 Mar 2015; Denis Dupeyron  +openblas-0.2.14.ebuild:
+  Version bump.
+
   20 Oct 2014; Mark Wright  openblas-.ebuild:
   Thanks to kiwifb for reporting
   https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
new file mode 100644
index 000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build 
toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch";
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git";
+   EGIT_BRANCH="develop"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos 
~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+PDEPEND="
+   >=virtual/blas-2.1-r2[int64?]
+   >=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/openblas/cblas.h
+   /usr/include/openblas/f77blas.h
+   /usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+   local openblas_flags=""
+   use dynamic && \
+   openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
+   $(fortran-int64_is_int64_build) && \
+   openblas_flags+=" INTERFACE64=1"
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+   elif use openmp; then
+   openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+   fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
+   echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   $(fortran-int64_is_int64_build) && \
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   if [[ ${PV} != "" ]] ; then
+   find "${WORKDIR}" -maxdepth 1 -type d -name 
\*OpenBLAS\* && \
+   mv "${WORKDIR}"/*OpenBLAS* "${S}"
+   fi
+   fi
+}
+
+src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+   epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+   if [[ ${PV} == "0.2.11" ]] ; then
+   epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+   fi
+   # lapack and lapacke are not modified from upstream lapack
+   sed \
+   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+   -i Makefile.rule || die
+   multibuild_copy_sources
+}
+
+src_configure() {
+   local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )

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

[Justin Lecher]

commit: 5b5e9e7d6c21a48ad35d3fc033902201a71a06d4
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 18 14:01:11 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:05:57 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b5e9e7d

multibuild openblas when USE=int64 is specified.

---
 sci-libs/openblas/ChangeLog|   3 +
 sci-libs/openblas/openblas-.ebuild | 221 +
 2 files changed, 142 insertions(+), 82 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index caf34f2..b4f5886 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2014; Mark Wright  openblas-.ebuild:
+  multibuild openblas when USE=int64 is specified.
+
   06 Jan 2014; Justin Lecher  openblas-.ebuild,
   metadata.xml:
   Switch from git-2 to git-r3

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 618c03b..3bd158a 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit alternatives-2 eutils fortran-2 git-r3 multilib toolchain-funcs
+inherit alternatives-2 eutils fortran-2 git-r3 multilib multibuild 
toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
@@ -14,105 +14,162 @@ EGIT_BRANCH="develop"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="int64 dynamic openmp static-libs threads"
+IUSE="dynamic int64 openmp static-libs threads"
 KEYWORDS=""
 
-src_configure() {
-   # lapack and lapacke are not modified from upstream lapack
-   sed \
-   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
-   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-   -i Makefile.rule || die
-}
-
-openblas_compile() {
-   local profname=$1
-   einfo "Compiling profile ${profname}"
-   # cflags already defined twice
-   unset CFLAGS
-   emake clean
-   emake libs shared ${openblas_flags}
-   mkdir -p libs && mv libopenblas* libs/
-   # avoid pic when compiling static libraries, so re-compiling
-   if use static-libs; then
-   emake clean
-   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-   mv libopenblas* libs/
-   fi
-   cat <<-EOF > ${profname}.pc
-   prefix=${EPREFIX}/usr
-   libdir=\${prefix}/$(get_libdir)
-   includedir=\${prefix}/include
-   Name: ${PN}
-   Description: ${DESCRIPTION}
-   Version: ${PV}
-   URL: ${HOMEPAGE}
-   Libs: -L\${libdir} -lopenblas
-   Libs.private: -lm
-   Cflags: -I\${includedir}/${PN}
-   EOF
-}
+INT64_SUFFIX="int64"
+BASE_PROFNAME="openblas"
 
-src_compile() {
-   # openblas already does multi-jobs
-   MAKEOPTS+=" -j1"
-   openblas_flags=""
-   local openblas_name=openblas
+get_openblas_flags() {
+   local openblas_flags=""
use dynamic && \
-   openblas_name+="-dynamic" && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
-   use int64 && \
-   openblas_name+="-int64" && \
-   openblas_flags+=" INTERFACE64=1"
-
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   fi
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
-   openblas_name+="-threads"
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_name+="-openmp"
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
-   openblas_compile ${openblas_name}
-   mv libs/libopenblas* . || die
+   echo "${openblas_flags}"
+}
+
+get_profname() {
+   local profname="${BASE_PROFNAME}"
+   use dynamic && \
+   profname+="-dynamic"
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   profname+="-${INT64_SUFFIX}"
+   fi
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   profname+="-threads"
+   elif use openmp; then
+   profname+="-openmp"
+   fi
+   echo "${profname}"
+}
+
+pkg_setup() {
+   # The file /usr/include/openblas/openblas_config.h is generated during 
the install.
+   # By list

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

[Justin Lecher]

commit: f487803ec21a1ee723327b55fa10292146fe1d2c
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:28:21 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:28:21 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f487803e

Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 39d360f..9f9c82e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,7 +2,6 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -24,8 +23,6 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
-===
->>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Justin Lecher]

commit: 0cc5ee5acce2af5afeacb555efb5f1aa3a64c379
Author: gienah  gentoo  org>
AuthorDate: Wed Feb 19 10:16:43 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cc5ee5a

Thanks to sfabbro: dodoc should be outside the function, they do not change

---
 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index b4f5886..68e0955 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2014; Mark Wright  openblas-.ebuild:
+  Thanks to sfabbro: dodoc should be outside the function, they do not change
+
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 3bd158a..3e3cd52 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -158,9 +158,6 @@ src_install() {
doins ${pcfile}
done
 
-   dodoc 
GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-   dodoc *md Changelog.txt
-
if [[ ${CHOST} == *-darwin* ]] ; then
cd "${ED}"/usr/$(get_libdir)
local d
@@ -172,4 +169,7 @@ src_install() {
fi
}
multibuild_foreach_variant run_in_build_dir my_src_install
+
+   dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+   dodoc *md Changelog.txt
 }

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

[Justin Lecher]

commit: fbdfad7d139533e2e0d3b6993685b75772823f07
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 13 01:02:57 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:40:42 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fbdfad7d

Remove the setting of the FC and F77 environment variables, instead sed the 
COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add 
get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the 
pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the 
defines, then remove the OPENBLAS_ at the start, and sed these into COMMON_OPT 
in Makefile.rule, as USE64BITINT was removed by the patch 
openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is required 
to ensure the openblas_config.h header file is the same between ABIs.

---
 sci-libs/openblas/ChangeLog| 11 
 sci-libs/openblas/openblas-.ebuild | 50 --
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..bb794f4 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Sep 2014; Mark Wright  openblas-.ebuild:
+  Remove the setting of the FC and F77 environment variables, instead sed the
+  COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add
+  get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the
+  pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the
+  defines, then remove the OPENBLAS_ at the start, and sed these into
+  COMMON_OPT in Makefile.rule, as USE64BITINT was removed by the patch
+  openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is
+  required to ensure the openblas_config.h header file is the same between
+  ABIs.
+
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index b3854fe..61ddcf0 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -55,6 +55,27 @@ get_openblas_flags() {
echo "${openblas_flags}"
 }
 
+get_openblas_abi_cflags() {
+   local openblas_abi_cflags=""
+   if [[ "${ABI}" == "x86" ]]; then
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
+   else
+   openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
+   fi
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+   fi
+   echo "${openblas_abi_cflags}"
+}
+
+get_openblas_abi_fflags() {
+   local openblas_abi_fflags=""
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_abi_fflags+="-fdefault-integer-8"
+   fi
+   echo "${openblas_abi_fflags}"
+}
+
 get_profname() {
local profname="${BASE_PROFNAME}"
use dynamic && \
@@ -118,8 +139,6 @@ _int64_multilib_multibuild_wrapper() {
 
local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -167,10 +186,12 @@ src_prepare() {
 src_configure() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
my_configure() {
+   local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+   local 
internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
sed \
-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) 
$(get_abi_CFLAGS):" \
-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) 
$(get_abi_CFLAGS):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
+   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} 
${internal_openblas_abi_cflags}:" \
-i Makefile.rule || die
}
multibuild_foreach_variant run_in_build_dir 
_int64_multilib_multibuild_wrapper my_configure
@@ -207,23 +228,12 @@ src_compile() {
Libs: -L\${libdir} -l${libname}
Libs.private: -lm
EOF
-   local openblas_abi_defs=""
-   if [[ "${ABI}" == "x86" ]]; then
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86=1 
-DOPENBLAS___32BIT__=1"
-   else
-   openblas_abi_defs="-DOPENBLAS_ARCH_X86_64=1 
-DOPENBLAS___64BIT__=1"
-   fi
-   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   cat <<-EOF >> ${profname}.pc
-  

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

[Justin Lecher]

commit: 76559c8bbd22f9fa2093008c96a0948c95e2a7f3
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 25 13:44:08 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=76559c8b

openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI

---
 sci-libs/openblas/openblas-.ebuild | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 1c2b6c6..f012efd 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() {
# will be overwritten by the normal variant in the install, which 
removes the
# #define OPENBLAS_USE64BITINT for us.  We then specify it in Cflags in 
the
# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+   local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
local MULTIBUILD_VARIANTS=( )
-   use int64 && \
-   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
-   MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) )
-   echo "${MULTIBUILD_VARIANTS[*]}"
+   for i in "${MULTILIB_VARIANTS[@]}"; do
+   if use int64 && [[ "${i}" =~ 64$ ]]; then
+   MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
+   fi
+   MULTIBUILD_VARIANTS+=( "${i}" )
+   done
+   echo "${MULTIBUILD_VARIANTS[@]}"
 }
 
 # @FUNCTION: _int64_multilib_multibuild_wrapper
@@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() {
 _int64_multilib_multibuild_wrapper() {
debug-print-function ${FUNCNAME} "${@}"
 
-   if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-   local ABI=${MULTIBUILD_VARIANT}
-   multilib_toolchain_setup "${ABI}"
-   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
-   fi
+   local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
+   multilib_toolchain_setup "${ABI}"
+   export FC="$(tc-getFC) $(get_abi_CFLAGS)"
+   export F77="$(tc-getF77) $(get_abi_CFLAGS)"
"${@}"
 }
 
@@ -191,7 +193,7 @@ src_test() {
 
 src_install() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
-   my_src_install () {
+   my_src_install() {
local openblas_flags=$(get_openblas_flags)
local profname=$(get_profname)
local pcfile

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

[Justin Lecher]

commit: 78241785859c81d96e24e12dd36836b5c23df1fd
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:22:30 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:22:30 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78241785

Fix rebase lapack-multibuild to master conflict 3 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..39d360f 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -23,6 +24,8 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
+===
+>>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Mark Wright]

commit: 800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 05:54:59 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 05:54:59 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=800e8d3b

Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler 
messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')', 
thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for reporting. The 
problem was that applying the 
-0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare() 
causes build failures on assembler code as the assembler does not understand 
sizeof(float). So delay applying the patch until src_install(). Bump openblas 
to 0.2.12.

---
 sci-libs/openblas/ChangeLog  | 13 +
 sci-libs/openblas/openblas-0.2.12.ebuild |  1 +
 sci-libs/openblas/openblas-.ebuild   |  9 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1af5fd9..1ad0bed 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.12 (19 Oct 2014)
+
+  19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,
+  openblas-.ebuild:
+  Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler
+  messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing
+  ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for
+  reporting. The problem was that applying the
+  -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare()
+  causes build failures on assembler code as the assembler does not understand
+  sizeof(float). So delay applying the patch until src_install(). Bump openblas
+  to 0.2.12.
+
   13 Oct 2014; Mark Wright  openblas-.ebuild:
   Refactor openblas to use the fortran-int64.eclass. Move the virtuals from
   RDEPEND to PDEPEND to avoid circular dependencies. Specify the pkg-config

diff --git a/sci-libs/openblas/openblas-0.2.12.ebuild 
b/sci-libs/openblas/openblas-0.2.12.ebuild
new file mode 12
index 000..2381753
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.12.ebuild
@@ -0,0 +1 @@
+openblas-.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index a33e449..5843200 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -80,10 +80,9 @@ src_unpack() {
 src_prepare() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
-   if [[ ${PV} != "" ]] ; then
+   if [[ ${PV} == "0.2.11" ]] ; then
epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
fi
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
# lapack and lapacke are not modified from upstream lapack
sed \
-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
@@ -160,6 +159,12 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until src_install().
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: c035b265ecc77dbab84a3492829d7de9a0c217e3
Author: gienah  gentoo  org>
AuthorDate: Sun Oct 19 10:20:52 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Oct 19 10:20:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c035b265

The fix for Bug 524612 failed in src_install building openblas from git. The 
fix is to move applying the patch to src_compile after building the library, 
then remove config.h and config_last.h; make config.h - ignoring the spurious 
warning; then cp config.h to config_last.h.

---
 sci-libs/openblas/ChangeLog|  6 ++
 sci-libs/openblas/openblas-.ebuild | 16 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1ad0bed..cc7349a 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2014; Mark Wright  openblas-.ebuild:
+  The fix for Bug 524612 failed in src_install building openblas from git. The
+  fix is to move applying the patch to src_compile after building the library,
+  then remove config.h and config_last.h; make config.h - ignoring the spurious
+  warning; then cp config.h to config_last.h.
+
 *openblas-0.2.12 (19 Oct 2014)
 
   19 Oct 2014; Mark Wright  +openblas-0.2.12.ebuild,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 5843200..7c22ca6 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -125,6 +125,16 @@ src_compile() {
emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
mv libopenblas* libs/
fi
+   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
+   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
+   # The problem is applying this patch in src_prepare() causes 
build failures on
+   # assembler code as the assembler does not understand 
sizeof(float).  So
+   # delay applying the patch until after building the libraries.
+   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+   rm -f config.h config_last.h
+   # Note: prints this spurious warning: make: Nothing to be done 
for 'config.h'.
+   emake config.h
+   cp config.h config_last.h || die
cat <<-EOF > ${profname}.pc
prefix=${EPREFIX}/usr
libdir=\${prefix}/$(get_libdir)
@@ -159,12 +169,6 @@ src_test() {
 src_install() {
local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
my_src_install() {
-   # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - 
Assembler messages:
-   # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: 
missing ')'
-   # The problem is applying this patch in src_prepare() causes 
build failures on
-   # assembler code as the assembler does not understand 
sizeof(float).  So
-   # delay applying the patch until src_install().
-   epatch 
"${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
local openblas_flags=$(get_openblas_flags)
local profname=$(fortran-int64_get_profname)
local pcfile

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

[Mark Wright]

commit: 08e04d6e9d0357253d1ea001d7c957a74e537384
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Mark Wright  gentoo  org>
CommitDate: Mon Oct 20 12:31:36 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08e04d6e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Justin Lecher]

commit: beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5
Author: gienah  gentoo  org>
AuthorDate: Mon Oct 20 12:31:36 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 20 12:34:54 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=beb6c45e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 
- Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog| 5 +
 sci-libs/openblas/openblas-.ebuild | 9 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright  openblas-.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright  openblas-.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
use dynamic && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
$(fortran-int64_is_int64_build) && \
-   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   openblas_flags+=" INTERFACE64=1"
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
elif use openmp; then
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
+   local profname=$(fortran-int64_get_profname)
+   local libname="${profname//-/_}"
+   local underscoresuffix="${libname#${PN}}"
+   if [[ "${underscoresuffix}" != "_" ]]; then
+   local libnamesuffix="${underscoresuffix#_}"
+   openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+   fi
echo "${openblas_flags}"
 }
 

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

[Justin Lecher]

commit: 5b5e9e7d6c21a48ad35d3fc033902201a71a06d4
Author: gienah  gentoo  org>
AuthorDate: Tue Feb 18 14:01:11 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:05:57 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b5e9e7d

multibuild openblas when USE=int64 is specified.

---
 sci-libs/openblas/ChangeLog|   3 +
 sci-libs/openblas/openblas-.ebuild | 221 +
 2 files changed, 142 insertions(+), 82 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index caf34f2..b4f5886 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2014; Mark Wright  openblas-.ebuild:
+  multibuild openblas when USE=int64 is specified.
+
   06 Jan 2014; Justin Lecher  openblas-.ebuild,
   metadata.xml:
   Switch from git-2 to git-r3

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 618c03b..3bd158a 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit alternatives-2 eutils fortran-2 git-r3 multilib toolchain-funcs
+inherit alternatives-2 eutils fortran-2 git-r3 multilib multibuild 
toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/";
@@ -14,105 +14,162 @@ EGIT_BRANCH="develop"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="int64 dynamic openmp static-libs threads"
+IUSE="dynamic int64 openmp static-libs threads"
 KEYWORDS=""
 
-src_configure() {
-   # lapack and lapacke are not modified from upstream lapack
-   sed \
-   -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-   -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-   -e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
-   -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-   -e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-   -i Makefile.rule || die
-}
-
-openblas_compile() {
-   local profname=$1
-   einfo "Compiling profile ${profname}"
-   # cflags already defined twice
-   unset CFLAGS
-   emake clean
-   emake libs shared ${openblas_flags}
-   mkdir -p libs && mv libopenblas* libs/
-   # avoid pic when compiling static libraries, so re-compiling
-   if use static-libs; then
-   emake clean
-   emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-   mv libopenblas* libs/
-   fi
-   cat <<-EOF > ${profname}.pc
-   prefix=${EPREFIX}/usr
-   libdir=\${prefix}/$(get_libdir)
-   includedir=\${prefix}/include
-   Name: ${PN}
-   Description: ${DESCRIPTION}
-   Version: ${PV}
-   URL: ${HOMEPAGE}
-   Libs: -L\${libdir} -lopenblas
-   Libs.private: -lm
-   Cflags: -I\${includedir}/${PN}
-   EOF
-}
+INT64_SUFFIX="int64"
+BASE_PROFNAME="openblas"
 
-src_compile() {
-   # openblas already does multi-jobs
-   MAKEOPTS+=" -j1"
-   openblas_flags=""
-   local openblas_name=openblas
+get_openblas_flags() {
+   local openblas_flags=""
use dynamic && \
-   openblas_name+="-dynamic" && \
openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 
NO_AFFINITY=1"
-   use int64 && \
-   openblas_name+="-int64" && \
-   openblas_flags+=" INTERFACE64=1"
-
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+   fi
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
if use threads; then
-   openblas_name+="-threads"
openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
elif use openmp; then
-   openblas_name+="-openmp"
openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
fi
-   openblas_compile ${openblas_name}
-   mv libs/libopenblas* . || die
+   echo "${openblas_flags}"
+}
+
+get_profname() {
+   local profname="${BASE_PROFNAME}"
+   use dynamic && \
+   profname+="-dynamic"
+   if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+   profname+="-${INT64_SUFFIX}"
+   fi
+   # choose posix threads over openmp when the two are set
+   # yet to see the need of having the two profiles simultaneously
+   if use threads; then
+   profname+="-threads"
+   elif use openmp; then
+   profname+="-openmp"
+   fi
+   echo "${profname}"
+}
+
+pkg_setup() {
+   # The file /usr/include/openblas/openblas_config.h is generated during 
the install.
+   # By list

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

[Justin Lecher]

commit: f487803ec21a1ee723327b55fa10292146fe1d2c
Author: gienah  gentoo  org>
AuthorDate: Sat Sep 27 11:28:21 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:28:21 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f487803e

Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 39d360f..9f9c82e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,7 +2,6 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-<<< HEAD
   06 Sep 2014; Mark Wright  +openblas-0.2.11.ebuild,
   openblas-.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -24,8 +23,6 @@
   19 Feb 2014; Mark Wright  openblas-.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
-===
->>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Justin Lecher]

commit: 0cc5ee5acce2af5afeacb555efb5f1aa3a64c379
Author: gienah  gentoo  org>
AuthorDate: Wed Feb 19 10:16:43 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cc5ee5a

Thanks to sfabbro: dodoc should be outside the function, they do not change

---
 sci-libs/openblas/ChangeLog| 3 +++
 sci-libs/openblas/openblas-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index b4f5886..68e0955 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2014; Mark Wright  openblas-.ebuild:
+  Thanks to sfabbro: dodoc should be outside the function, they do not change
+
   18 Feb 2014; Mark Wright  openblas-.ebuild:
   multibuild openblas when USE=int64 is specified.
 

diff --git a/sci-libs/openblas/openblas-.ebuild 
b/sci-libs/openblas/openblas-.ebuild
index 3bd158a..3e3cd52 100644
--- a/sci-libs/openblas/openblas-.ebuild
+++ b/sci-libs/openblas/openblas-.ebuild
@@ -158,9 +158,6 @@ src_install() {
doins ${pcfile}
done
 
-   dodoc 
GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-   dodoc *md Changelog.txt
-
if [[ ${CHOST} == *-darwin* ]] ; then
cd "${ED}"/usr/$(get_libdir)
local d
@@ -172,4 +169,7 @@ src_install() {
fi
}
multibuild_foreach_variant run_in_build_dir my_src_install
+
+   dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+   dodoc *md Changelog.txt
 }