Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
3544:f32ee23a7261 3545:c21ca79d7980
9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz 9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz
10 $(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE) 10 $(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
11 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 11 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
12 $(PKG)_FONTCONFIG := fontconfig 12 $(PKG)_FONTCONFIG := fontconfig
13 endif 13 endif
14 $(PKG)_DEPS := arpack curl fftw fltk $($(PKG)_FONTCONFIG) gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib 14 $(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
15 ifeq ($(ENABLE_JIT),yes) 15 ifeq ($(ENABLE_JIT),yes)
16 $(PKG)_DEPS += llvm 16 $(PKG)_DEPS += llvm
17 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit 17 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
18 else 18 else
19 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit 19 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
30 endif 30 endif
31 endif 31 endif
32 32
33 ifneq ($(ENABLE_DOCS),yes) 33 ifneq ($(ENABLE_DOCS),yes)
34 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs 34 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
35 endif
36
37 ifeq ($(ENABLE_OPENBLAS),yes)
38 $(PKG)_DEPS += openblas
39 $(PKG)_BLAS_OPTION := --with-blas=openblas
40 else
41 $(PKG)_DEPS += blas
42 endif 35 endif
43 36
44 ifeq ($(MXE_NATIVE_BUILD),yes) 37 ifeq ($(MXE_NATIVE_BUILD),yes)
45 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) 38 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
46 ifeq ($(ENABLE_64),yes) 39 ifeq ($(ENABLE_64),yes)
100 mkdir '$(1)/.build' 93 mkdir '$(1)/.build'
101 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ 94 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
102 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ 95 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
103 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ 96 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
104 --prefix='$($(PKG)_PREFIX)' \ 97 --prefix='$($(PKG)_PREFIX)' \
105 $($(PKG)_BLAS_OPTION) \
106 $($(PKG)_CROSS_CONFIG_OPTIONS) \ 98 $($(PKG)_CROSS_CONFIG_OPTIONS) \
107 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \ 99 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
108 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \ 100 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
109 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ 101 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
110 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ 102 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \