Mercurial > mxe-octave

changeset 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 f32ee23a7261
children 763df540d5d5
files makeinst-script.sh src/arpack.mk src/lapack.mk src/octave.mk src/qrupdate.mk src/stable-octave.mk src/suitesparse.mk
diffstat 7 files changed, 19 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/makeinst-script.sh	Thu Feb 20 02:08:21 2014 -0500
+++ b/makeinst-script.sh	Thu Feb 20 14:48:42 2014 -0500
@@ -159,7 +159,14 @@
   \${NSD_CreateDropList} 120u 70 100u 80u ""
   Pop \$InstallBlasLibCtrl
   \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS"
+EOF
+   # add option to install libopenblas if we have the dll present
+   if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then
+     cat >> $OUTFILE << EOF
   \${NSD_CB_AddString} \$InstallBlasLibCtrl "OpenBLAS"
+EOF
+  fi
+  cat >> $OUTFILE << EOF
   \${NSD_CB_SelectString} \$InstallBlasLibCtrl "Reference BLAS"
 
   !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing"
--- 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)'
--- 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)
--- a/src/octave.mk	Thu Feb 20 02:08:21 2014 -0500
+++ b/src/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) \
--- a/src/qrupdate.mk	Thu Feb 20 02:08:21 2014 -0500
+++ b/src/qrupdate.mk	Thu Feb 20 14:48:42 2014 -0500
@@ -8,15 +8,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := qrupdate-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://sourceforge.net/projects/qrupdate/files/$($(PKG)_FILE)
-ifeq ($(ENABLE_OPENBLAS),yes)
-  $(PKG)_DEPS     := openblas lapack
-else
-  $(PKG)_DEPS     := blas lapack
-endif
-
-ifeq ($(ENABLE_OPENBLAS),yes)
-  $(PKG)_BLAS_OPTION := --with-blas=openblas
-endif
+$(PKG)_DEPS     := blas lapack
 
 ifeq ($(ENABLE_64),yes)
   $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := FFLAGS="-g -O2 -fdefault-integer-8"
@@ -38,7 +30,6 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
 	$(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
-        $($(PKG)_BLAS_OPTION) \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) && $(CONFIGURE_POST_HOOK)
 
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
--- 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) \
--- a/src/suitesparse.mk	Thu Feb 20 02:08:21 2014 -0500
+++ b/src/suitesparse.mk	Thu Feb 20 14:48:42 2014 -0500
@@ -8,14 +8,9 @@
 $(PKG)_FILE     := SuiteSparse-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.cise.ufl.edu/research/sparse/SuiteSparse/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://distfiles.macports.org/SuiteSparse/$($(PKG)_FILE)
+$(PKG)_DEPS     := blas lapack
 
-ifeq ($(ENABLE_OPENBLAS),yes)
-  $(PKG)_DEPS     := openblas lapack
-  $(PKG)_BLAS_LIB := openblas
-else
-  $(PKG)_DEPS     := blas lapack
-  $(PKG)_BLAS_LIB := blas
-endif
+$(PKG)_BLAS_LIB := blas
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' | \