Mercurial > mxe-octave
changeset 3068:fb0836e4a677
Add --enable-openblas option to configure
* src/octave.mk: Set --with-blas=openblas if openblas was enabled and add openblas as an octave dependancy.
* configure.ac: Add experimental --with-openblas opyion.
* Makefile.in: Add ENABLE_OPENBAS flag.
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Thu, 20 Jun 2013 06:29:17 -0400 |
| parents | bdb4b64f2ff8 |
| children | 076acecb9c21 |
| files | Makefile.in configure.ac src/octave.mk |
| diffstat | 3 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Tue Jun 18 21:04:49 2013 -0400 +++ b/Makefile.in Thu Jun 20 06:29:17 2013 -0400 @@ -42,6 +42,9 @@ # Attempt to build LLVM and enable Octave's experimental JIT compiler. ENABLE_JIT := @ENABLE_JIT@ +# Use openblas for octave +ENABLE_OPENBLAS := @ENABLE_OPENBLAS@ + ## end of configuration variables. ifneq ($(MXE_NATIVE_BUILD),yes)
--- a/configure.ac Tue Jun 18 21:04:49 2013 -0400 +++ b/configure.ac Thu Jun 20 06:29:17 2013 -0400 @@ -101,6 +101,13 @@ [if test "$enableval" = yes; then USE_PIC_FLAG=yes; fi], []) AC_SUBST(USE_PIC_FLAG) +ENABLE_OPENBLAS=false +AC_ARG_ENABLE([openblas], + [AS_HELP_STRING([--enable-openblas], + [(EXPERIMENTAL) enable use of openblas in Octave])], + [if test "$enableval" = yes; then ENABLE_OPENBLAS=yes; fi], []) +AC_SUBST(ENABLE_OPENBLAS) + ### Default is to cross compile for mingw. echo $host_alias
--- a/src/octave.mk Tue Jun 18 21:04:49 2013 -0400 +++ b/src/octave.mk Thu Jun 20 06:29:17 2013 -0400 @@ -12,6 +12,11 @@ $(PKG)_DEPS += llvm endif +ifeq ($(ENABLE_OPENBLAS),yes) + $(PKG)_DEPS += openblas + $(PKG)_BLAS_OPTION := --with-blas=openblas +endif + ifeq ($(MXE_NATIVE_BUILD),yes) $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) ifeq ($(ENABLE_64),yes) @@ -41,6 +46,7 @@ LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ + $($(PKG)_BLAS_OPTION) \ $($(PKG)_CROSS_CONFIG_OPTIONS) \ $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS)