diff --git a/deps/Makefile b/deps/Makefile index 6cb73be..bcd8520 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -1049,7 +1049,7 @@ OPENBLAS_BUILD_OPTS += NO_AFFINITY=1 # Build for all architectures - required for distribution ifeq ($(OPENBLAS_DYNAMIC_ARCH), 1) -OPENBLAS_BUILD_OPTS += DYNAMIC_ARCH=1 +OPENBLAS_BUILD_OPTS += DYNAMIC_ARCH=1 MAKE_NO_J=1 endif # 64-bit BLAS interface @@ -1085,6 +1085,7 @@ OPENBLAS_BUILD_OPTS += NO_AVX2=1 endif $(OPENBLAS_SRC_DIR)/config.status: $(OPENBLAS_SRC_DIR)/Makefile + cd $(dir $@) && patch -p1 < ../openblas-make.patch ifeq ($(OS),WINNT) cd $(dir $@) && patch -p1 < ../openblas-win64.patch endif diff --git a/deps/openblas.version b/deps/openblas.version index 7c97e1b..58b9467 100644 --- a/deps/openblas.version +++ b/deps/openblas.version @@ -1,2 +1,2 @@ -OPENBLAS_BRANCH=v0.2.15 -OPENBLAS_SHA1=53e849f4fcae4363a64576de00e982722c7304f9 +OPENBLAS_BRANCH=v0.2.17 +OPENBLAS_SHA1=a71e8c82f6a9f73093b631e5deab1e8da716b61f --- a/deps/openblas-make.patch +++ b/deps/openblas-make.patch @@ -0,0 +1,35 @@ +diff --git a/Makefile.system b/Makefile.system +index b89f60e..2dbdad0 100644 +--- a/Makefile.system ++++ b/Makefile.system +@@ -139,6 +139,10 @@ NO_PARALLEL_MAKE=0 + endif + GETARCH_FLAGS += -DNO_PARALLEL_MAKE=$(NO_PARALLEL_MAKE) + ++ifdef MAKE_NO_J ++GETARCH_FLAGS += -DMAKE_NO_J=$(MAKE_NO_J) ++endif ++ + ifdef MAKE_NB_JOBS + GETARCH_FLAGS += -DMAKE_NB_JOBS=$(MAKE_NB_JOBS) + endif +diff --git a/getarch.c b/getarch.c +index f9c49e6..dffad70 100644 +--- a/getarch.c ++++ b/getarch.c +@@ -1012,6 +1012,7 @@ int main(int argc, char *argv[]){ + #endif + #endif + ++#ifndef MAKE_NO_J + #ifdef MAKE_NB_JOBS + printf("MAKE += -j %d\n", MAKE_NB_JOBS); + #elif NO_PARALLEL_MAKE==1 +@@ -1021,6 +1022,7 @@ int main(int argc, char *argv[]){ + printf("MAKE += -j %d\n", get_num_cores()); + #endif + #endif ++#endif + + break; +