Mercurial > mxe-octave
changeset 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 | 282bc5054a7f |
children | 08eb76a22fa0 |
files | src/default-octave.mk src/octave.mk src/osmesa.mk src/stable-octave.mk |
diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/default-octave.mk Sat Feb 14 19:58:11 2015 -0500 +++ b/src/default-octave.mk Sat Feb 14 19:59:17 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 osmesa 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 pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib ifeq ($(MXE_WINDOWS_BUILD),no) - $(PKG)_DEPS += x11 xext + $(PKG)_DEPS += x11 xext osmesa endif ifeq ($(ENABLE_64),no) $(PKG)_DEPS += qhull
--- a/src/octave.mk Sat Feb 14 19:58:11 2015 -0500 +++ b/src/octave.mk Sat Feb 14 19:59:17 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 osmesa 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 pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib ifeq ($(MXE_WINDOWS_BUILD),no) - $(PKG)_DEPS += x11 xext + $(PKG)_DEPS += x11 xext osmesa endif ifeq ($(ENABLE_64),no) $(PKG)_DEPS += qhull
--- a/src/osmesa.mk Sat Feb 14 19:58:11 2015 -0500 +++ b/src/osmesa.mk Sat Feb 14 19:59:17 2015 -0500 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1)/.build' cd '$(1)' && autoreconf - cd '$(1)/.build' && autoreconf && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ + cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \
--- a/src/stable-octave.mk Sat Feb 14 19:58:11 2015 -0500 +++ b/src/stable-octave.mk Sat Feb 14 19:59:17 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 osmesa 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 pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib ifeq ($(MXE_WINDOWS_BUILD),no) - $(PKG)_DEPS += x11 xext + $(PKG)_DEPS += x11 xext osmesa endif ifeq ($(ENABLE_64),no) $(PKG)_DEPS += qhull