pool/openblas
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 573788 from science

Browse Source 
- add openblas-s390.patch to build on s390 (bsc#1079513).

OBS-URL: https://build.opensuse.org/request/show/573788
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openblas?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2018-02-10 16:54:17 +00:00 committed by Git OBS Bridge
commit 8012c759d5
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openblas-s390.patch Normal file
View File

@ -0,0 +1,33 @@
--- OpenBLAS-0.2.20/c_check 2018/01/19 15:53:41 1.1
+++ OpenBLAS-0.2.20/c_check 2018/01/19 15:54:23
@@ -10,7 +10,7 @@
$hostarch = "arm" if ($hostarch =~ /^arm.*/);
$hostarch = "arm64" if ($hostarch eq "aarch64");
$hostarch = "power" if ($hostarch =~ /^(powerpc|ppc).*/);
-$hostarch = "zarch" if ($hostarch eq "s390x");
+$hostarch = "zarch" if ($hostarch =~ /^s390/);
$tmpf = new File::Temp( UNLINK => 1 );
$binary = $ENV{"BINARY"};
--- OpenBLAS-0.2.20/ctest.c 2018/01/19 15:54:29 1.1
+++ OpenBLAS-0.2.20/ctest.c 2018/01/19 15:54:49
@@ -105,7 +105,7 @@
ARCH_POWER
#endif
-#if defined(__s390x__) || defined(__zarch__)
+#if defined(__s390x__) || defined(__s390__) || defined(__zarch__)
ARCH_ZARCH
#endif
--- OpenBLAS-0.2.20/getarch.c 2018/01/19 15:54:57 1.1
+++ OpenBLAS-0.2.20/getarch.c 2018/01/19 15:55:07
@@ -974,7 +974,7 @@
#define OPENBLAS_SUPPORTED
#endif
-#if defined(__zarch__) || defined(__s390x__)
+#if defined(__zarch__) || defined(__s390x__) || defined(__s390__)
#define ZARCH
#include "cpuid_zarch.c"
#define OPENBLAS_SUPPORTED

5
openblas.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 30 18:19:33 CET 2018 - ro@suse.de
- add openblas-s390.patch to build on s390 (bsc#1079513).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 5 18:27:17 UTC 2018 - eich@suse.com Fri Jan 5 18:27:17 UTC 2018 - eich@suse.com

6
openblas.spec
View File

@ -131,6 +131,8 @@ Patch1: c_xerbla_no-void-return.patch
Patch2: openblas-noexecstack.patch Patch2: openblas-noexecstack.patch
# PATCH-FIX-UPSTREADM fix-arm64-cpuid-return.patch # PATCH-FIX-UPSTREADM fix-arm64-cpuid-return.patch
Patch4: fix-arm64-cpuid-return.patch Patch4: fix-arm64-cpuid-return.patch
# PATCH port
Patch5: openblas-s390.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -237,6 +239,10 @@ This package contains headers for OpenBLAS.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%ifarch s390
sed -i -e "s@m32@m31@" Makefile.system
%endif
%if %{without hpc} %if %{without hpc}
cp %{SOURCE1} . cp %{SOURCE1} .