Mercurial > mxe-octave

changeset 3246:0e705514af1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update lapack so compile correctly with openblas library (when enabled) src/lapack.mk: when enabled, add openblas as a dependancy and give cmake the openblas library to compile with lapack.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 03 Sep 2013 21:01:27 -0400
parents 94042dd6ea1a
children 2419325342a5
files src/lapack.mk
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/lapack.mk	Tue Sep 03 10:08:29 2013 -0400
+++ b/src/lapack.mk	Tue Sep 03 21:01:27 2013 -0400
@@ -9,6 +9,16 @@
 $(PKG)_URL_2    := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
+ifeq ($(ENABLE_OPENBLAS),yes)
+  $(PKG)_DEPS     += openblas
+
+  ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+    $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=$(HOST_BINDIR)/libopenblas.dll
+  else
+    $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=openblas
+  endif
+endif
+
 ifeq ($(ENABLE_64),yes)
   $(PKG)_DEFAULT_INTEGER_8_FLAG := -fdefault-integer-8
 endif
@@ -47,6 +57,7 @@
         -G 'MSYS Makefiles' \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \
+        $($(PKG)_BLAS_CONFIG_OPTS) \
         .
     $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' VERBOSE=1 install
 
@@ -71,6 +82,7 @@
         -DCMAKE_AR='$(MXE_AR)' \
         -DCMAKE_RANLIB='$(MXE_RANLIB)' \
         -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \
+        $($(PKG)_BLAS_CONFIG_OPTS) \
         .
     $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' VERBOSE=1 install
 endef