Mercurial > mxe-octave

diff src/stable-octave.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 b86f53e6429f
children c102f813be47
line wrap: on
line diff
--- a/src/stable-octave.mk	Thu Feb 20 02:08:21 2014 -0500
+++ b/src/stable-octave.mk	Thu Feb 20 14:48:42 2014 -0500
@@ -11,7 +11,7 @@
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := arpack curl fftw fltk $($(PKG)_FONTCONFIG) gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl fftw fltk $($(PKG)_FONTCONFIG) gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(ENABLE_JIT),yes)
   $(PKG)_DEPS += llvm
   $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
@@ -34,13 +34,6 @@
   $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
 endif
 
-ifeq ($(ENABLE_OPENBLAS),yes)
-  $(PKG)_DEPS += openblas
-  $(PKG)_BLAS_OPTION := --with-blas=openblas
-else
-  $(PKG)_DEPS += blas
-endif
-
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
   ifeq ($(ENABLE_64),yes)
@@ -102,7 +95,6 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
-        $($(PKG)_BLAS_OPTION) \
         $($(PKG)_CROSS_CONFIG_OPTIONS) \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
         $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \