From 79be0c377bf3a7530d5e9bd3ccaf5fc329ca626e Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 4 Jun 2018 08:30:21 +0200 Subject: [PATCH] Disable running of all tests on RISC-V Signed-off-by: David Abdurachmanov --- openblas-0.3.0-disable-tests.patch | 13 +++++++++++++ ....0-riscv64.patch => openblas-0.3.0-riscv64.patch | 0 openblas.spec | 13 +++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 openblas-0.3.0-disable-tests.patch rename openblass-0.3.0-riscv64.patch => openblas-0.3.0-riscv64.patch (100%) diff --git a/openblas-0.3.0-disable-tests.patch b/openblas-0.3.0-disable-tests.patch new file mode 100644 index 0000000..a268f50 --- /dev/null +++ b/openblas-0.3.0-disable-tests.patch @@ -0,0 +1,13 @@ +diff --git a/OpenBLAS-0.3.0/Makefile b/OpenBLAS-0.3.0/Makefile +index 679bc8d..a8e26b3 100644 +--- a/OpenBLAS-0.3.0/Makefile ++++ b/OpenBLAS-0.3.0/Makefile +@@ -28,7 +28,7 @@ SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench + .PHONY : all libs netlib $(RELA) test ctest shared install + .NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test + +-all :: libs netlib $(RELA) tests shared ++all :: libs netlib $(RELA) shared + @echo + @echo " OpenBLAS build complete. ($(LIB_COMPONENTS))" + @echo diff --git a/openblass-0.3.0-riscv64.patch b/openblas-0.3.0-riscv64.patch similarity index 100% rename from openblass-0.3.0-riscv64.patch rename to openblas-0.3.0-riscv64.patch diff --git a/openblas.spec b/openblas.spec index 6f1f70d..889a793 100644 --- a/openblas.spec +++ b/openblas.spec @@ -15,7 +15,7 @@ Name: openblas Version: 0.3.0 -Release: 1.0.riscv64%{?dist} +Release: 1.1.riscv64%{?dist} Summary: An optimized BLAS library based on GotoBLAS2 Group: Development/Libraries License: BSD @@ -34,7 +34,9 @@ Patch4: 1572.patch # Add support for RISC-V (riscv64) # Taken from https://github.com/xianyi/OpenBLAS/pull/1526 # No additional modifications done -Patch5: openblass-0.3.0-riscv64.patch +Patch5: openblas-0.3.0-riscv64.patch +# Disable running of tests +Patch6: openblas-0.3.0-disable-tests.patch BuildRequires: gcc BuildRequires: gcc-gfortran @@ -236,6 +238,9 @@ cd OpenBLAS-%{version} %patch3 -p1 -b .tests %patch4 -p1 -b .ppc64le %patch5 -p2 -b .riscv64 +%ifarch riscv64 +%patch6 -p2 -b .disable-tests +%endif # Fix source permissions find -name \*.f -exec chmod 644 {} \; @@ -674,6 +679,10 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig %endif %changelog +* Mon Jun 04 2018 David Abdurachmanov - 0.3.0-1.1.riscv64 +- Fix typo in RISC-V patch name +- Disable running of all tests on RISC-V + * Sun Jun 03 2018 David Abdurachmanov - 0.3.0-1.0.riscv64 - Add support for RISC-V (riscv64)