Mercurial > mxe-octave
diff src/default-octave.mk @ 4339:07671a76e291
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 |
line wrap: on
line diff
--- a/src/default-octave.mk Wed Jan 18 07:20:46 2017 -0500 +++ b/src/default-octave.mk Thu Jan 19 07:43:05 2017 -0500 @@ -14,7 +14,7 @@ ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif -$(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 +$(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 ifeq ($(ENABLE_QT5),yes) $(PKG)_DEPS += qt5 @@ -34,9 +34,6 @@ endif endif -ifeq ($(ENABLE_64),no) - $(PKG)_DEPS += qhull -endif ifeq ($(ENABLE_JIT),yes) $(PKG)_DEPS += llvm $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit @@ -80,7 +77,7 @@ ifeq ($(MXE_NATIVE_BUILD),yes) $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) ifeq ($(ENABLE_64),yes) - $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull + $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 else $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64 endif @@ -90,7 +87,7 @@ FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ gl_cv_func_gettimeofday_clobber=no ifeq ($(ENABLE_64),yes) - $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull + $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 else $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64 endif