From 4e72da0691359e5ce868513cac7ae45ad41b4d24 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 13 Jul 2017 20:53:38 +0200
Subject: [PATCH] Disable ReLAPACK by default; mention it in final build
 message if included

---
 Makefile        |  2 +-
 Makefile.rule   |  4 ++--
 Makefile.system | 35 +++++------------------------------
 3 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index 107dff5f2..1b9bcb118 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ SUBDIRS	+= lapack
 endif
 
 RELA =
-ifneq ($(BUILD_RELAPACK), 0)
+ifeq ($(BUILD_RELAPACK), 1)
 RELA = re_lapack
 endif
 
diff --git a/Makefile.rule b/Makefile.rule
index 2866699be..c91b4c8b9 100644
--- a/Makefile.rule
+++ b/Makefile.rule
@@ -84,7 +84,7 @@ VERSION = 0.2.20.dev
 BUILD_LAPACK_DEPRECATED = 1
 
 # Build RecursiveLAPACK on top of LAPACK
-BUILD_RELAPACK = 1
+# BUILD_RELAPACK = 1
 
 # If you want to use legacy threaded Level 3 implementation.
 # USE_SIMPLE_THREADED_LEVEL3 = 1
@@ -100,7 +100,7 @@ BUILD_RELAPACK = 1
 NO_WARMUP = 1
 
 # If you want to disable CPU/Memory affinity on Linux.
-#NO_AFFINITY = 1
+NO_AFFINITY = 1
 
 # if you are compiling for Linux and you have more than 16 numa nodes or more than 256 cpus
 # BIGNUMA = 1
diff --git a/Makefile.system b/Makefile.system
index 29d3efd53..d0a837046 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -414,6 +414,7 @@ CCOMMON_OPT    += -fopenmp
 endif
 
 ifeq ($(C_COMPILER), CLANG)
+$(error OpenBLAS: Clang didn't support OpenMP yet.)
 CCOMMON_OPT    += -fopenmp
 endif
 
@@ -452,9 +453,8 @@ DYNAMIC_CORE += HASWELL ZEN
 endif
 endif
 
-# If DYNAMIC_CORE is not set, DYNAMIC_ARCH cannot do anything, so force it to empty
 ifndef DYNAMIC_CORE
-override DYNAMIC_ARCH=
+DYNAMIC_ARCH =
 endif
 endif
 
@@ -482,17 +482,6 @@ endif
 ifeq ($(ARCH), arm)
 NO_BINARY_MODE  = 1
 BINARY_DEFINED  = 1
-
-CCOMMON_OPT += -marm
-FCOMMON_OPT += -marm
-
-ifeq ($(ARM_SOFTFP_ABI), 1)
-CCOMMON_OPT += -mfloat-abi=softfp -DARM_SOFTFP_ABI
-FCOMMON_OPT += -mfloat-abi=softfp -DARM_SOFTFP_ABI
-else
-CCOMMON_OPT += -mfloat-abi=hard
-FCOMMON_OPT += -mfloat-abi=hard
-endif
 endif
 
 ifeq ($(ARCH), arm64)
@@ -594,23 +583,6 @@ endif
 #  Fortran Compiler dependent settings
 #
 
-ifeq ($(F_COMPILER), FLANG)
-CCOMMON_OPT += -DF_INTERFACE_FLANG
-ifdef BINARY64
-ifdef INTERFACE64
-ifneq ($(INTERFACE64), 0)
-FCOMMON_OPT += -i8
-endif
-endif
-FCOMMON_OPT += -Wall
-else
-FCOMMON_OPT += -Wall
-endif
-ifeq ($(USE_OPENMP), 1)
-FCOMMON_OPT += -fopenmp
-endif
-endif
-
 ifeq ($(F_COMPILER), G77)
 CCOMMON_OPT += -DF_INTERFACE_G77
 FCOMMON_OPT += -Wall
@@ -1119,6 +1091,9 @@ LIB_COMPONENTS += LAPACK
 ifneq ($(NO_LAPACKE), 1)
 LIB_COMPONENTS += LAPACKE
 endif
+ifeq (${BUILD_RELAPACK}, 1)
+LIB_COMPONENTS += ReLAPACK
+endif
 endif
 
 ifeq ($(ONLY_CBLAS), 1)