Mercurial > mxe-octave

comparison src/default-octave.mk @ 4779:2612d718f3a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only conditionally depend on mesa. * default-octave.mk, release-octave.mk, stable-octave.mk: Only depend on mesa if we are not using the system OpenGL libraries.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 30 Jul 2018 20:38:47 +0200
parents a6b4355efbd6
children ebb6dbbb8b3f
comparison
equal deleted inserted replaced
4778:a50783d698b2 4779:2612d718f3a5
19 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz 19 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz
20 $(PKG)_URL := http://not.a.valid.url/$($(PKG)_FILE) 20 $(PKG)_URL := http://not.a.valid.url/$($(PKG)_FILE)
21 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 21 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
22 $(PKG)_FONTCONFIG := fontconfig 22 $(PKG)_FONTCONFIG := fontconfig
23 endif 23 endif
24 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile mesa pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib 24 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib
25 25
26 ifeq ($(ENABLE_QT5),yes) 26 ifeq ($(ENABLE_QT5),yes)
27 $(PKG)_DEPS += qt5 27 $(PKG)_DEPS += qt5
28 else 28 else
29 $(PKG)_DEPS += qt 29 $(PKG)_DEPS += qt
30 endif
31
32 ifeq ($(USE_SYSTEM_OPENGL),no)
33 $(PKG)_DEPS += mesa
30 endif 34 endif
31 35
32 ifeq ($(MXE_WINDOWS_BUILD),yes) 36 ifeq ($(MXE_WINDOWS_BUILD),yes)
33 $(PKG)_WITH_BLAS_CONFIGURE_OPTIONS := --with-blas="-lblas -lxerbla" 37 $(PKG)_WITH_BLAS_CONFIGURE_OPTIONS := --with-blas="-lblas -lxerbla"
34 else 38 else