Mercurial > mxe-octave

changeset 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 a50783d698b2
children 68d78fdbdc78
files src/default-octave.mk src/release-octave.mk src/stable-octave.mk
diffstat 3 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/default-octave.mk	Mon Jul 30 11:27:32 2018 -0400
+++ b/src/default-octave.mk	Mon Jul 30 20:38:47 2018 +0200
@@ -21,7 +21,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 mesa pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib
+$(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
 
 ifeq ($(ENABLE_QT5),yes)
     $(PKG)_DEPS += qt5
@@ -29,6 +29,10 @@
     $(PKG)_DEPS += qt
 endif
 
+ifeq ($(USE_SYSTEM_OPENGL),no)
+  $(PKG)_DEPS += mesa
+endif
+
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_WITH_BLAS_CONFIGURE_OPTIONS := --with-blas="-lblas -lxerbla"
 else
--- a/src/release-octave.mk	Mon Jul 30 11:27:32 2018 -0400
+++ b/src/release-octave.mk	Mon Jul 30 20:38:47 2018 +0200
@@ -42,7 +42,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 mesa pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib
+$(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
 
 ifeq ($(ENABLE_QT5),yes)
     $(PKG)_DEPS += qt5
@@ -50,6 +50,10 @@
     $(PKG)_DEPS += qt
 endif
 
+ifeq ($(USE_SYSTEM_OPENGL),no)
+  $(PKG)_DEPS += mesa
+endif
+
 ifeq ($(MXE_WINDOWS_BUILD),no)
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += x11 xext
--- a/src/stable-octave.mk	Mon Jul 30 11:27:32 2018 -0400
+++ b/src/stable-octave.mk	Mon Jul 30 20:38:47 2018 +0200
@@ -22,7 +22,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 mesa pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib
+$(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
 
 ifeq ($(ENABLE_QT5),yes)
     $(PKG)_DEPS += qt5
@@ -30,6 +30,10 @@
     $(PKG)_DEPS += qt
 endif
 
+ifeq ($(USE_SYSTEM_OPENGL),no)
+  $(PKG)_DEPS += mesa
+endif
+
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_WITH_BLAS_CONFIGURE_OPTIONS := --with-blas="-lblas -lxerbla"
 else