comparison src/default-octave.mk @ 3788:f6d63f2a2de6

allow osmesa to build; remove it from octave deps for Windows systems
author John W. Eaton <jwe@octave.org>
date Sat, 14 Feb 2015 19:59:17 -0500
parents e1e69acf0bb2
children 26f72c8e2be7
comparison
equal deleted inserted replaced
3787:282bc5054a7f 3788:f6d63f2a2de6
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 qt readline suitesparse texinfo zlib 17 $(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
18 ifeq ($(MXE_WINDOWS_BUILD),no) 18 ifeq ($(MXE_WINDOWS_BUILD),no)
19 $(PKG)_DEPS += x11 xext 19 $(PKG)_DEPS += x11 xext osmesa
20 endif 20 endif
21 ifeq ($(ENABLE_64),no) 21 ifeq ($(ENABLE_64),no)
22 $(PKG)_DEPS += qhull 22 $(PKG)_DEPS += qhull
23 endif 23 endif
24 ifeq ($(ENABLE_JIT),yes) 24 ifeq ($(ENABLE_JIT),yes)