From 4534979eb20baef23af6f0f2fcb44a75ba42e1c9 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 28 Oct 2015 16:41:47 +0100 Subject: [PATCH] Update patch. --- ...tch => openblas-0.2.15-system_lapack.patch | 28 +++++++++++++------ openblas.spec | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) rename openblas-0.2.11-system_lapack.patch => openblas-0.2.15-system_lapack.patch (74%) diff --git a/openblas-0.2.11-system_lapack.patch b/openblas-0.2.15-system_lapack.patch similarity index 74% rename from openblas-0.2.11-system_lapack.patch rename to openblas-0.2.15-system_lapack.patch index ba32147..3430bc0 100644 --- a/openblas-0.2.11-system_lapack.patch +++ b/openblas-0.2.15-system_lapack.patch @@ -1,7 +1,19 @@ -diff -up OpenBLAS-0.2.11/Makefile.system_lapack OpenBLAS-0.2.11/Makefile ---- OpenBLAS-0.2.11/Makefile.system_lapack 2014-08-17 20:16:14.000000000 -0700 -+++ OpenBLAS-0.2.11/Makefile 2014-08-23 21:02:54.004245912 -0700 -@@ -209,57 +209,8 @@ hpl_p : +diff -up OpenBLAS-0.2.15/Makefile.system_lapack OpenBLAS-0.2.15/Makefile +--- OpenBLAS-0.2.15/Makefile.system_lapack 2015-10-28 08:36:08.234073535 -0700 ++++ OpenBLAS-0.2.15/Makefile 2015-10-28 08:38:10.847518880 -0700 +@@ -16,11 +16,6 @@ BLASDIRS += reference + endif + + SUBDIRS = $(BLASDIRS) +-ifneq ($(NO_LAPACK), 1) +-SUBDIRS += lapack +-endif +- +-LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) + + SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench + +@@ -211,57 +206,8 @@ hpl_p : fi; \ done @@ -27,7 +39,7 @@ diff -up OpenBLAS-0.2.11/Makefile.system_lapack OpenBLAS-0.2.11/Makefile - -@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc - -@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -- -@echo "NOOPT = $(LAPACK_FFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc +- -@echo "NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc @@ -60,9 +72,9 @@ diff -up OpenBLAS-0.2.11/Makefile.system_lapack OpenBLAS-0.2.11/Makefile large.tgz : ifndef NOFORTRAN -diff -up OpenBLAS-0.2.11/Makefile.system.system_lapack OpenBLAS-0.2.11/Makefile.system ---- OpenBLAS-0.2.11/Makefile.system.system_lapack 2014-08-17 20:16:14.000000000 -0700 -+++ OpenBLAS-0.2.11/Makefile.system 2014-08-23 21:02:37.723976242 -0700 +diff -up OpenBLAS-0.2.15/Makefile.system.system_lapack OpenBLAS-0.2.15/Makefile.system +--- OpenBLAS-0.2.15/Makefile.system.system_lapack 2015-10-27 13:44:50.000000000 -0700 ++++ OpenBLAS-0.2.15/Makefile.system 2015-10-28 08:36:08.234073535 -0700 @@ -9,7 +9,7 @@ ifndef TOPDIR TOPDIR = . endif diff --git a/openblas.spec b/openblas.spec index 335840f..6edbc91 100644 --- a/openblas.spec +++ b/openblas.spec @@ -7,7 +7,7 @@ License: BSD URL: https://github.com/xianyi/OpenBLAS/ Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz # Use system lapack -Patch0: openblas-0.2.11-system_lapack.patch +Patch0: openblas-0.2.15-system_lapack.patch # Drop extra p from threaded library name Patch1: openblas-0.2.5-libname.patch # Don't test link against functions in lapacke 3.5.0 if only 3.4.0 is available