Mercurial > mxe-octave

diff src/octave.mk @ 2874:890aa60f7b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Temporary Octave patch file, improve Octave config and build.
author John W. Eaton <jwe@octave.org>
date Wed, 28 Nov 2012 17:43:36 -0500
parents 43a1c4d36636
children 152e3e693568
line wrap: on
line diff
--- a/src/octave.mk	Wed Nov 28 16:10:18 2012 -0500
+++ b/src/octave.mk	Wed Nov 28 17:43:36 2012 -0500
@@ -4,6 +4,7 @@
 PKG             := octave
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := 1ea936554aaabaabb747a4fcf98ecfbbfb265656
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://jweaton.org/$($(PKG)_FILE)
 $(PKG)_DEPS     := arpack blas curl fltk gcc glpk graphicsmagick lapack pcre qrupdate readline suitesparse zlib
@@ -15,14 +16,15 @@
 
 define $(PKG)_BUILD
     # build GCC and support libraries
-    mkdir '$(1).build'
-    cd '$(1).build' && '$(1)/octave-$($(PKG)_VERSION)/configure' \
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && '$(1)/configure' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-opengl \
         --disable-docs \
-        --disable-gui
-    sed -i '/^#define \(gm\|local\)time rpl_/d' '$(1).build/config.h'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)' install
+        --disable-gui \
+        gl_cv_func_gettimeofday_clobber=no
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
 endef