Mercurial > mxe-octave

changeset 3791:26f72c8e2be7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include osmesa in octave deps for all systems
author John W. Eaton <jwe@octave.org>
date Sun, 15 Feb 2015 14:36:31 -0500
parents a169ad26bac2
children 1a2fec9962a7
files src/default-octave.mk src/octave.mk src/stable-octave.mk
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/default-octave.mk	Sun Feb 15 13:33:36 2015 -0500
+++ b/src/default-octave.mk	Sun Feb 15 14:36:31 2015 -0500
@@ -14,9 +14,9 @@
 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 pcre portaudio pstoedit qrupdate qscintilla qt 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 qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext osmesa
+  $(PKG)_DEPS += x11 xext
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull
--- a/src/octave.mk	Sun Feb 15 13:33:36 2015 -0500
+++ b/src/octave.mk	Sun Feb 15 14:36:31 2015 -0500
@@ -11,9 +11,9 @@
 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 pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext osmesa
+  $(PKG)_DEPS += x11 xext
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull
--- a/src/stable-octave.mk	Sun Feb 15 13:33:36 2015 -0500
+++ b/src/stable-octave.mk	Sun Feb 15 14:36:31 2015 -0500
@@ -11,9 +11,9 @@
 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 pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext osmesa
+  $(PKG)_DEPS += x11 xext
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull