Mercurial > mxe-octave

comparison src/octave.mk @ 3692:2b4493282fc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable qhull for --enable-64 builds
author John W. Eaton <jwe@octave.org>
date Wed, 20 Aug 2014 16:35:27 -0400
parents fc67e3ab9324
children 4f58c4b4dee0
comparison
equal deleted inserted replaced
3691:c734f4d39243 3692:2b4493282fc7
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 := blas arpack curl fftw fltk $($(PKG)_FONTCONFIG) ghostscript 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) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
15 ifeq ($(ENABLE_64),no)
16 $(PKG)_DEPS += qhull
17 endif
15 ifeq ($(ENABLE_JIT),yes) 18 ifeq ($(ENABLE_JIT),yes)
16 $(PKG)_DEPS += llvm 19 $(PKG)_DEPS += llvm
17 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit 20 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
18 else 21 else
19 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit 22 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
35 endif 38 endif
36 39
37 ifeq ($(MXE_NATIVE_BUILD),yes) 40 ifeq ($(MXE_NATIVE_BUILD),yes)
38 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) 41 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
39 ifeq ($(ENABLE_64),yes) 42 ifeq ($(ENABLE_64),yes)
40 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 43 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8
41 endif 44 endif
42 else 45 else
43 ifeq ($(MXE_SYSTEM),mingw) 46 ifeq ($(MXE_SYSTEM),mingw)
44 $(PKG)_CROSS_CONFIG_OPTIONS := \ 47 $(PKG)_CROSS_CONFIG_OPTIONS := \
45 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ 48 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
46 gl_cv_func_gettimeofday_clobber=no 49 gl_cv_func_gettimeofday_clobber=no
47 ifeq ($(ENABLE_64),yes) 50 ifeq ($(ENABLE_64),yes)
48 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes 51 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
49 endif 52 endif
50 endif 53 endif
51 endif 54 endif
52 55
53 ifeq ($(MXE_SYSTEM),msvc) 56 ifeq ($(MXE_SYSTEM),msvc)