Mercurial > mxe-octave

changeset 3069:076acecb9c21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update octave dependancies that use blas to also use openblas * src/arpack.mk: set openblas as a dependancy if enable-openblas was set and include as configure option. * src/octave.mk: remove blas as a dependancy if enable-openblas was set. * src/suitsparse.mk: set openblas as a dependancy and set in makeflags if enable-openblas was set.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 20 Jun 2013 17:21:08 -0400
parents fb0836e4a677
children d89eccc2edd3
files src/arpack.mk src/octave.mk src/suitesparse.mk
diffstat 3 files changed, 29 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/arpack.mk	Thu Jun 20 06:29:17 2013 -0400
+++ b/src/arpack.mk	Thu Jun 20 17:21:08 2013 -0400
@@ -7,7 +7,11 @@
 $(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)
-$(PKG)_DEPS     := blas lapack
+ifeq ($(ENABLE_OPENBLAS),yes)
+  $(PKG)_DEPS     := openblas lapack
+else
+  $(PKG)_DEPS     := blas lapack
+endif
 
 ifeq ($(USE_PIC_FLAG),yes)
   $(PKG)_CONFIGURE_PIC_OPTION := --with-pic
@@ -17,6 +21,13 @@
   $(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
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package arpack.' >&2;
     echo $(arpack_VERSION)
@@ -30,6 +41,7 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --enable-static --disable-shared \
 	$($(PKG)_CONFIGURE_PIC_OPTION) \
+        $($(PKG)_BLAS_OPTION) \
         --prefix='$(HOST_PREFIX)' \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS)
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
@@ -39,6 +51,6 @@
     fi
 
     if [ $(BUILD_SHARED) = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' -llapack -lblas; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' -llapack -l$($(PKG)_BLAS_LIB); \
     fi
 endef
--- a/src/octave.mk	Thu Jun 20 06:29:17 2013 -0400
+++ b/src/octave.mk	Thu Jun 20 17:21:08 2013 -0400
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk fontconfig glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := arpack curl fftw fltk fontconfig glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(ENABLE_JIT),yes)
   $(PKG)_DEPS += llvm
 endif
@@ -15,6 +15,8 @@
 ifeq ($(ENABLE_OPENBLAS),yes)
   $(PKG)_DEPS += openblas
   $(PKG)_BLAS_OPTION := --with-blas=openblas
+else
+  $(PKG)_DEPS += blas
 endif
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
--- a/src/suitesparse.mk	Thu Jun 20 06:29:17 2013 -0400
+++ b/src/suitesparse.mk	Thu Jun 20 17:21:08 2013 -0400
@@ -7,7 +7,14 @@
 $(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
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' | \
@@ -48,7 +55,7 @@
         CXXFLAGS='$(MXE_CXXFLAGS)' \
         AR='$(MXE_AR)' \
         RANLIB='$(MXE_RANLIB)' \
-        BLAS='-lblas -lgfortran -lgfortranbegin' \
+        BLAS='-l$($(PKG)_BLAS_LIB) -lgfortran -lgfortranbegin' \
         CHOLMOD_CONFIG='-DNPARTITION'
 
     # install library files
@@ -62,7 +69,7 @@
         deplibs=""; \
         case $$lib in \
           libcholmod) \
-            deplibs="-lamd -lcolamd -lsuitesparseconfig -llapack -lblas"; \
+            deplibs="-lamd -lcolamd -lsuitesparseconfig -llapack -l$($PKG)_BLAS_LIB)"; \
           ;; \
           libklu) \
             deplibs="-lbtf -lamd -lcolamd -lsuitesparseconfig"; \
@@ -71,10 +78,10 @@
             deplibs="-lsuitesparseconfig"; \
           ;; \
 	  libspqr) \
-            deplibs="-lcholmod -lsuitesparseconfig -llapack -lblas"; \
+            deplibs="-lcholmod -lsuitesparseconfig -llapack -l$($(PKG)_BLAS_LIB)"; \
           ;; \
           libumfpack) \
-            deplibs="-lcholmod -lamd -lsuitesparseconfig -lblas"; \
+            deplibs="-lcholmod -lamd -lsuitesparseconfig -l$($(PKG)_BLAS_LIB)"; \
           ;; \
         esac; \
         if [ -n "$deplibs" ]; then \