diff src/octave.mk @ 2899:b4e625571bf6 stable

Include fontconfig and freetype as a dependencies of Octave. Allow configuring with opengl. Patch Octave configure script to use pkg-config to check for freetype libraries.
author John W. Eaton <jwe@octave.org>
date Tue, 04 Dec 2012 13:44:38 -0500
parents 8d7005cff4a4
children 2784771bed32
line wrap: on
line diff
--- a/src/octave.mk	Tue Dec 04 10:47:21 2012 -0500
+++ b/src/octave.mk	Tue Dec 04 13:44:38 2012 -0500
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
+$(PKG)_DEPS     := arpack blas curl fftw fltk fontconfig freetype gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
@@ -15,14 +15,14 @@
 endef
 
 define $(PKG)_BUILD
-    # build GCC and support libraries
+    cd '$(1)' && autoreconf
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --without-opengl \
         --disable-docs \
+        FLTK_CONFIG="$(PREFIX)/bin/$(TARGET)-fltk-config" \
         gl_cv_func_gettimeofday_clobber=no
 
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install