From eeb9603ad71f1162bed8e4d2feb2811d80644d9c3a8075cc6f01ecaf3fc073cc Mon Sep 17 00:00:00 2001 From: Dmitry Roshchin Date: Tue, 6 Feb 2018 09:34:52 +0000 Subject: [PATCH 1/3] Accepting request 573243 from home:eeich:branches:science - OpenBLAS doesn't support s390: do not build it there (bsc#1079513). OBS-URL: https://build.opensuse.org/request/show/573243 OBS-URL: https://build.opensuse.org/package/show/science/openblas?expand=0&rev=63 --- openblas.changes | 5 +++++ openblas.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/openblas.changes b/openblas.changes index 6e5295d..c88d097 100644 --- a/openblas.changes +++ b/openblas.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 6 09:06:20 UTC 2018 - eich@suse.com + +- OpenBLAS doesn't support s390: do not build it there (bsc#1079513). + ------------------------------------------------------------------- Fri Jan 5 18:27:17 UTC 2018 - eich@suse.com diff --git a/openblas.spec b/openblas.spec index 40a90d1..2418f68 100644 --- a/openblas.spec +++ b/openblas.spec @@ -29,6 +29,10 @@ ExclusiveArch: do_not_build %endif +%ifarch s390 +ExclusiveArch: do_not_build +%endif + %global build_flags USE_THREAD=1 USE_OPENMP=1 %if "%flavor" == "serial" From 7e03e033962c941e11d97c0ec67bfce5d317d83bac0e211d28634fa087cba721 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 7 Feb 2018 16:13:12 +0000 Subject: [PATCH 2/3] Accepting request 571250 from home:oertel:branches:science - add openblas-s390.patch to build on s390 OBS-URL: https://build.opensuse.org/request/show/571250 OBS-URL: https://build.opensuse.org/package/show/science/openblas?expand=0&rev=64 --- openblas-s390.patch | 33 +++++++++++++++++++++++++++++++++ openblas.changes | 5 +++++ openblas.spec | 6 ++++++ 3 files changed, 44 insertions(+) create mode 100644 openblas-s390.patch diff --git a/openblas-s390.patch b/openblas-s390.patch new file mode 100644 index 0000000..d960e49 --- /dev/null +++ b/openblas-s390.patch @@ -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 diff --git a/openblas.changes b/openblas.changes index c88d097..f249160 100644 --- a/openblas.changes +++ b/openblas.changes @@ -3,6 +3,11 @@ Tue Feb 6 09:06:20 UTC 2018 - eich@suse.com - OpenBLAS doesn't support s390: do not build it there (bsc#1079513). +------------------------------------------------------------------- +Tue Jan 30 18:19:33 CET 2018 - ro@suse.de + +- add openblas-s390.patch to build on s390 + ------------------------------------------------------------------- Fri Jan 5 18:27:17 UTC 2018 - eich@suse.com diff --git a/openblas.spec b/openblas.spec index 2418f68..f9fa698 100644 --- a/openblas.spec +++ b/openblas.spec @@ -135,6 +135,8 @@ Patch1: c_xerbla_no-void-return.patch Patch2: openblas-noexecstack.patch # PATCH-FIX-UPSTREADM fix-arm64-cpuid-return.patch Patch4: fix-arm64-cpuid-return.patch +# PATCH port +Patch5: openblas-s390.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -241,6 +243,10 @@ This package contains headers for OpenBLAS. %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 +%ifarch s390 +sed -i -e "s@m32@m31@" Makefile.system +%endif %if %{without hpc} cp %{SOURCE1} . From 0deb6f1a78d28089f6652e596918498574611a21bbc172bd8b5ca9e34e10e2e0 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 7 Feb 2018 16:25:42 +0000 Subject: [PATCH 3/3] - add openblas-s390.patch to build on s390 (bsc#1079513). OBS-URL: https://build.opensuse.org/package/show/science/openblas?expand=0&rev=65 --- openblas.changes | 7 +------ openblas.spec | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/openblas.changes b/openblas.changes index f249160..01b03f9 100644 --- a/openblas.changes +++ b/openblas.changes @@ -1,12 +1,7 @@ -------------------------------------------------------------------- -Tue Feb 6 09:06:20 UTC 2018 - eich@suse.com - -- OpenBLAS doesn't support s390: do not build it there (bsc#1079513). - ------------------------------------------------------------------- Tue Jan 30 18:19:33 CET 2018 - ro@suse.de -- add openblas-s390.patch to build on s390 +- add openblas-s390.patch to build on s390 (bsc#1079513). ------------------------------------------------------------------- Fri Jan 5 18:27:17 UTC 2018 - eich@suse.com diff --git a/openblas.spec b/openblas.spec index f9fa698..261000d 100644 --- a/openblas.spec +++ b/openblas.spec @@ -29,10 +29,6 @@ ExclusiveArch: do_not_build %endif -%ifarch s390 -ExclusiveArch: do_not_build -%endif - %global build_flags USE_THREAD=1 USE_OPENMP=1 %if "%flavor" == "serial"