Mercurial > mxe-octave

comparison src/default-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 8528b1ccd529
children bf358512f67e
comparison
equal deleted inserted replaced
4338:52d2410929f4 4339:07671a76e291
12 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz 12 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz
13 $(PKG)_URL := http://hydra.nixos.org/job/gnu/octave-default/tarball/latest/download 13 $(PKG)_URL := http://hydra.nixos.org/job/gnu/octave-default/tarball/latest/download
14 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 14 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
15 $(PKG)_FONTCONFIG := fontconfig 15 $(PKG)_FONTCONFIG := fontconfig
16 endif 16 endif
17 $(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 17 $(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
18 18
19 ifeq ($(ENABLE_QT5),yes) 19 ifeq ($(ENABLE_QT5),yes)
20 $(PKG)_DEPS += qt5 20 $(PKG)_DEPS += qt5
21 else 21 else
22 $(PKG)_DEPS += qt 22 $(PKG)_DEPS += qt
32 ifeq ($(USE_SYSTEM_GCC),no) 32 ifeq ($(USE_SYSTEM_GCC),no)
33 $(PKG)_DEPS += libgomp 33 $(PKG)_DEPS += libgomp
34 endif 34 endif
35 endif 35 endif
36 36
37 ifeq ($(ENABLE_64),no)
38 $(PKG)_DEPS += qhull
39 endif
40 ifeq ($(ENABLE_JIT),yes) 37 ifeq ($(ENABLE_JIT),yes)
41 $(PKG)_DEPS += llvm 38 $(PKG)_DEPS += llvm
42 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit 39 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
43 else 40 else
44 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit 41 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
78 endif 75 endif
79 76
80 ifeq ($(MXE_NATIVE_BUILD),yes) 77 ifeq ($(MXE_NATIVE_BUILD),yes)
81 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) 78 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
82 ifeq ($(ENABLE_64),yes) 79 ifeq ($(ENABLE_64),yes)
83 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull 80 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64
84 else 81 else
85 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64 82 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64
86 endif 83 endif
87 else 84 else
88 ifeq ($(MXE_SYSTEM),mingw) 85 ifeq ($(MXE_SYSTEM),mingw)
89 $(PKG)_CROSS_CONFIG_OPTIONS := \ 86 $(PKG)_CROSS_CONFIG_OPTIONS := \
90 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ 87 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
91 gl_cv_func_gettimeofday_clobber=no 88 gl_cv_func_gettimeofday_clobber=no
92 ifeq ($(ENABLE_64),yes) 89 ifeq ($(ENABLE_64),yes)
93 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull 90 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64
94 else 91 else
95 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64 92 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64
96 endif 93 endif
97 endif 94 endif
98 endif 95 endif