Mercurial > mxe-octave

comparison src/octave.mk @ 4339:07671a76e291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qhull: enable qhull when compiling for 64bit (Bug #50069) * src/default-octave.mk, src/octave.mk, src/stable-octave.mk: make qhull always a dependancy, remove --without-qhull
author John D
date Thu, 19 Jan 2017 07:43:05 -0500
parents 0e35d2f6fc6a
children e9b032b9340a
comparison
equal deleted inserted replaced
4338:52d2410929f4 4339:07671a76e291
9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz 9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz
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 epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla readline suitesparse texinfo zlib 14 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qhull qrupdate qscintilla readline suitesparse texinfo zlib
15 15
16 ifeq ($(ENABLE_QT5),yes) 16 ifeq ($(ENABLE_QT5),yes)
17 $(PKG)_DEPS += qt5 17 $(PKG)_DEPS += qt5
18 else 18 else
19 $(PKG)_DEPS += qt 19 $(PKG)_DEPS += qt
26 endif 26 endif
27 ifeq ($(MXE_SYSTEM),mingw) 27 ifeq ($(MXE_SYSTEM),mingw)
28 ifeq ($(USE_SYSTEM_GCC),no) 28 ifeq ($(USE_SYSTEM_GCC),no)
29 $(PKG)_DEPS += libgomp 29 $(PKG)_DEPS += libgomp
30 endif 30 endif
31 endif
32 ifeq ($(ENABLE_64),no)
33 $(PKG)_DEPS += qhull
34 endif 31 endif
35 ifeq ($(ENABLE_JIT),yes) 32 ifeq ($(ENABLE_JIT),yes)
36 $(PKG)_DEPS += llvm 33 $(PKG)_DEPS += llvm
37 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit 34 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
38 else 35 else
72 endif 69 endif
73 70
74 ifeq ($(MXE_NATIVE_BUILD),yes) 71 ifeq ($(MXE_NATIVE_BUILD),yes)
75 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) 72 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
76 ifeq ($(ENABLE_64),yes) 73 ifeq ($(ENABLE_64),yes)
77 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8 74 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8
78 endif 75 endif
79 else 76 else
80 ifeq ($(MXE_SYSTEM),mingw) 77 ifeq ($(MXE_SYSTEM),mingw)
81 $(PKG)_CROSS_CONFIG_OPTIONS := \ 78 $(PKG)_CROSS_CONFIG_OPTIONS := \
82 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ 79 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
83 gl_cv_func_gettimeofday_clobber=no 80 gl_cv_func_gettimeofday_clobber=no
84 ifeq ($(ENABLE_64),yes) 81 ifeq ($(ENABLE_64),yes)
85 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes 82 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
86 endif 83 endif
87 endif 84 endif
88 endif 85 endif
89 86
90 ifeq ($(MXE_SYSTEM),msvc) 87 ifeq ($(MXE_SYSTEM),msvc)