Mercurial > mxe-octave

diff src/lapack.mk @ 3545:c21ca79d7980

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution * makeinst-script.sh: check if libopenblas.dll is in distro before adding combo box option. * src/arpack.mk, lapack.mk, octave.mk, qrupdate.mk, stable-octave.mk, suitesparse.mk: remove ENABLE_OPENBLAS option.
author John Donoghue
date Thu, 20 Feb 2014 14:48:42 -0500
parents f5cc3c3a40e6
children 007590237873
line wrap: on
line diff
--- a/src/lapack.mk	Thu Feb 20 02:08:21 2014 -0500
+++ b/src/lapack.mk	Thu Feb 20 14:48:42 2014 -0500
@@ -8,16 +8,12 @@
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-ifeq ($(ENABLE_OPENBLAS),yes)
-  $(PKG)_DEPS     += openblas
+$(PKG)_DEPS     := blas
 
-  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
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=$(HOST_BINDIR)/libblas.dll
+else
+  $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=blas
 endif
 
 ifeq ($(ENABLE_64),yes)