Mercurial > mxe-octave

diff src/arpack.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 361f5149d073
children a4f6dc84ac5b
line wrap: on
line diff
--- a/src/arpack.mk	Thu Feb 20 02:08:21 2014 -0500
+++ b/src/arpack.mk	Thu Feb 20 14:48:42 2014 -0500
@@ -8,11 +8,7 @@
 $(PKG)_SUBDIR   := $(PKG)-ng-$($(PKG)_VERSION)
 $(PKG)_FILE     := arpack-ng_$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/$($(PKG)_FILE)
-ifeq ($(ENABLE_OPENBLAS),yes)
-  $(PKG)_DEPS     := openblas lapack
-else
-  $(PKG)_DEPS     := blas lapack
-endif
+$(PKG)_DEPS     := blas lapack
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
@@ -26,12 +22,7 @@
   $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := FFLAGS="-g -O2 -fdefault-integer-8"
 endif
 
-ifeq ($(ENABLE_OPENBLAS),yes)
-  $(PKG)_BLAS_OPTION := --with-blas=openblas
-  $(PKG)_BLAS_LIB := openblas
-else
-  $(PKG)_BLAS_LIB := blas
-endif
+$(PKG)_BLAS_LIB := blas
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package arpack.' >&2;
@@ -46,7 +37,6 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --enable-static --disable-shared \
 	$($(PKG)_CONFIGURE_PIC_OPTION) \
-        $($(PKG)_BLAS_OPTION) \
         --prefix='$(HOST_PREFIX)' \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)'