aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgienah <gienah@gentoo.org>2014-09-07 03:02:52 +1000
committergienah <gienah@gentoo.org>2014-09-27 21:12:20 +1000
commitabd7cbdbc2e94bcad23344cd07281afc3a8bead7 (patch)
treebbed01b372aa81f179be87df55e561e0e8e3b9e5
parentFix rebase lapack-multibuild to master conflict 2 on sci-libs/lapack-reference (diff)
downloadsci-abd7cbdbc2e94bcad23344cd07281afc3a8bead7.tar.gz
sci-abd7cbdbc2e94bcad23344cd07281afc3a8bead7.tar.bz2
sci-abd7cbdbc2e94bcad23344cd07281afc3a8bead7.zip
openblas-0.2.11 requires the cpuid_x86 patch
-rw-r--r--ChangeLog10
-rw-r--r--sci-libs/openblas/files/openblas-0.2.11-cpuid_x86.patch (renamed from sci-libs/openblas/files/openblas-9999-cpuid_x86.patch)0
-rw-r--r--sci-libs/openblas/openblas-9999.ebuild3
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..57a6083b7
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for layman/science
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 06 Sep 2014; Mark Wright <gienah@gentoo.org>
+ sci-libs/openblas/openblas-9999.ebuild, openblas-9999.ebuild,
+ +sci-libs/openblas/files/openblas-0.2.11-cpuid_x86.patch,
+ -sci-libs/openblas/files/openblas-9999-cpuid_x86.patch:
+ openblas-0.2.11 requires the cpuid_x86 patch
+
diff --git a/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch b/sci-libs/openblas/files/openblas-0.2.11-cpuid_x86.patch
index c6f299132..c6f299132 100644
--- a/sci-libs/openblas/files/openblas-9999-cpuid_x86.patch
+++ b/sci-libs/openblas/files/openblas-0.2.11-cpuid_x86.patch
diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index e809907ef..b3854fec7 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -151,6 +151,9 @@ src_unpack() {
src_prepare() {
epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+ if [[ ${PV} != "9999" ]] ; 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 \