Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/openblas/
Date: Sun, 21 Feb 2016 15:16:18
Message-Id: 1456067757.27ed0382803df0e13f89838353309dfd81f509a1.jlec@gentoo
1 commit: 27ed0382803df0e13f89838353309dfd81f509a1
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 21 15:15:57 2016 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 21 15:15:57 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=27ed0382
7
8 sci-libs/openblas: Build 32bit binaries using BINARY=32 as suggested by upstream
9
10 * Bump to EAPI=6
11
12 Github: Closes gentoo-science/sci#591
13
14 Package-Manager: portage-2.2.27
15 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
16
17 sci-libs/openblas/openblas-0.2.14.ebuild | 13 ++++++++++---
18 sci-libs/openblas/openblas-0.2.15.ebuild | 13 ++++++++++---
19 sci-libs/openblas/openblas-9999.ebuild | 13 ++++++++++---
20 3 files changed, 30 insertions(+), 9 deletions(-)
21
22 diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild b/sci-libs/openblas/openblas-0.2.14.ebuild
23 index 61fbdc5..592bec4 100644
24 --- a/sci-libs/openblas/openblas-0.2.14.ebuild
25 +++ b/sci-libs/openblas/openblas-0.2.14.ebuild
26 @@ -1,8 +1,8 @@
27 -# Copyright 1999-2015 Gentoo Foundation
28 +# Copyright 1999-2016 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 # $Id$
31
32 -EAPI=5
33 +EAPI=6
34
35 NUMERIC_MODULE_NAME="openblas"
36
37 @@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
38 /usr/include/openblas/openblas_config.h
39 )
40
41 +PATCHES=(
42 + "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
43 +)
44 +
45 get_openblas_flags() {
46 local openblas_flags=()
47 use dynamic && \
48 @@ -49,6 +53,9 @@ get_openblas_flags() {
49 local libnamesuffix="${underscoresuffix#_}"
50 openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
51 fi
52 +
53 + [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
54 +
55 echo "${openblas_flags[@]}"
56 }
57
58 @@ -71,7 +78,7 @@ src_unpack() {
59 }
60
61 src_prepare() {
62 - epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
63 + default
64
65 # lapack and lapacke are not modified from upstream lapack
66 sed \
67
68 diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild b/sci-libs/openblas/openblas-0.2.15.ebuild
69 index 61fbdc5..592bec4 100644
70 --- a/sci-libs/openblas/openblas-0.2.15.ebuild
71 +++ b/sci-libs/openblas/openblas-0.2.15.ebuild
72 @@ -1,8 +1,8 @@
73 -# Copyright 1999-2015 Gentoo Foundation
74 +# Copyright 1999-2016 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 # $Id$
77
78 -EAPI=5
79 +EAPI=6
80
81 NUMERIC_MODULE_NAME="openblas"
82
83 @@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
84 /usr/include/openblas/openblas_config.h
85 )
86
87 +PATCHES=(
88 + "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
89 +)
90 +
91 get_openblas_flags() {
92 local openblas_flags=()
93 use dynamic && \
94 @@ -49,6 +53,9 @@ get_openblas_flags() {
95 local libnamesuffix="${underscoresuffix#_}"
96 openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
97 fi
98 +
99 + [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
100 +
101 echo "${openblas_flags[@]}"
102 }
103
104 @@ -71,7 +78,7 @@ src_unpack() {
105 }
106
107 src_prepare() {
108 - epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
109 + default
110
111 # lapack and lapacke are not modified from upstream lapack
112 sed \
113
114 diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
115 index 2dba543..b7bf4a2 100644
116 --- a/sci-libs/openblas/openblas-9999.ebuild
117 +++ b/sci-libs/openblas/openblas-9999.ebuild
118 @@ -1,8 +1,8 @@
119 -# Copyright 1999-2015 Gentoo Foundation
120 +# Copyright 1999-2016 Gentoo Foundation
121 # Distributed under the terms of the GNU General Public License v2
122 # $Id$
123
124 -EAPI=5
125 +EAPI=6
126
127 NUMERIC_MODULE_NAME="openblas"
128
129 @@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
130 /usr/include/openblas/openblas_config.h
131 )
132
133 +PATCHES=(
134 + "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
135 +)
136 +
137 get_openblas_flags() {
138 local openblas_flags=()
139 use dynamic && \
140 @@ -49,6 +53,9 @@ get_openblas_flags() {
141 local libnamesuffix="${underscoresuffix#_}"
142 openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
143 fi
144 +
145 + [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
146 +
147 echo "${openblas_flags[@]}"
148 }
149
150 @@ -65,7 +72,7 @@ get_openblas_abi_cflags() {
151 }
152
153 src_prepare() {
154 - epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
155 + default
156
157 # lapack and lapacke are not modified from upstream lapack
158 sed \