From 5b3b53ac69456df626d14754c475657ae3f6d45a Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Mon, 12 Aug 2019 11:33:02 +0200 Subject: [PATCH] Update tests patch. --- ....2-tests.patch => openblas-0.3.7-tests.patch | 17 ++++++++++------- openblas.spec | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) rename openblas-0.3.2-tests.patch => openblas-0.3.7-tests.patch (54%) diff --git a/openblas-0.3.2-tests.patch b/openblas-0.3.7-tests.patch similarity index 54% rename from openblas-0.3.2-tests.patch rename to openblas-0.3.7-tests.patch index 0c75289..a3c78a9 100644 --- a/openblas-0.3.2-tests.patch +++ b/openblas-0.3.7-tests.patch @@ -1,18 +1,21 @@ -diff -up OpenBLAS-0.3.2/Makefile.tests OpenBLAS-0.3.2/Makefile ---- OpenBLAS-0.3.2/Makefile.tests 2018-08-02 14:12:01.615117002 +0200 -+++ OpenBLAS-0.3.2/Makefile 2018-08-02 14:13:29.582918971 +0200 -@@ -122,11 +122,11 @@ tests : +diff -up OpenBLAS-0.3.7/Makefile.tests OpenBLAS-0.3.7/Makefile +--- OpenBLAS-0.3.7/Makefile.tests 2019-08-11 23:23:27.000000000 +0200 ++++ OpenBLAS-0.3.7/Makefile 2019-08-12 11:32:09.937281485 +0200 +@@ -123,13 +123,13 @@ tests : ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) touch $(LIBNAME) ifndef NO_FBLAS - $(MAKE) -C test all -- $(MAKE) -C utest all + $(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all -+ $(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all endif +- $(MAKE) -C utest all ++ $(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all ifndef NO_CBLAS - $(MAKE) -C ctest all + $(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all + ifeq ($(CPP_THREAD_SAFETY_TEST), 1) +- $(MAKE) -C cpp_thread_test all ++ $(MAKE) -C cpp_thread_test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all + endif endif endif - diff --git a/openblas.spec b/openblas.spec index 76f7fa5..5102f4a 100644 --- a/openblas.spec +++ b/openblas.spec @@ -27,7 +27,7 @@ Patch1: openblas-0.2.5-libname.patch # Don't use constructor priorities on too old architectures Patch2: openblas-0.2.15-constructor.patch # Supply the proper flags to the test makefile -Patch3: openblas-0.3.2-tests.patch +Patch3: openblas-0.3.7-tests.patch BuildRequires: gcc BuildRequires: gcc-gfortran