Mercurial > mxe-octave

changeset 2900:2784771bed32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable with default and update to newer Octave version
author John W. Eaton <jwe@octave.org>
date Tue, 04 Dec 2012 14:10:44 -0500
parents 23a535663fce (current diff) b4e625571bf6 (diff)
children 558397d29e38
files src/octave-1-fixes.patch src/octave.mk
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk	Tue Dec 04 10:47:47 2012 -0500
+++ b/src/octave.mk	Tue Dec 04 14:10:44 2012 -0500
@@ -3,7 +3,7 @@
 
 PKG             := octave
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 618eda703553b79de4c83b2217ae6c26cef66b01
+$(PKG)_CHECKSUM := 8df8e9641dc5dedd170035b0e2648c37f9c15e8e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://jweaton.org/$($(PKG)_FILE)
@@ -15,15 +15,14 @@
 endef
 
 define $(PKG)_BUILD
-    # build GCC and support libraries
     mkdir '$(1)/.build'
     cd '$(1)/.build' && '$(1)/configure' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --without-opengl \
         --disable-docs \
         --disable-gui \
+        FLTK_CONFIG="$(PREFIX)/bin/$(TARGET)-fltk-config" \
         gl_cv_func_gettimeofday_clobber=no
 
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install