Mercurial > hg > mxe-octave-anirudha
changeset 2874:890aa60f7b87
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 | f423f81f414e |
files | src/octave-1-fixes.patch src/octave.mk |
diffstat | 2 files changed, 57 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/src/octave-1-fixes.patch @@ -0,0 +1,50 @@ +--- a/liboctave/system/oct-env.cc 2012-10-01 18:29:42.000000000 -0400 ++++ b/liboctave/system/oct-env.cc 2012-11-28 16:56:46.075849540 -0500 +@@ -48,5 +48,6 @@ + + #include <sys/types.h> + #include <unistd.h> ++#include <unistd.h> + + #include "progname.h" + +--- a/libinterp/parse-tree/lex.cc 2012-10-01 18:34:09.000000000 -0400 ++++ b/libinterp/parse-tree/lex.cc 2012-11-28 17:25:36.779585192 -0500 +@@ -1260,6 +1260,7 @@ + + #include <sys/types.h> + #include <unistd.h> ++#include <unistd.h> + + #include "cmd-edit.h" + #include "quit.h" +--- a/libinterp/parse-tree/lex.ll 2012-10-01 18:31:00.000000000 -0400 ++++ b/libinterp/parse-tree/lex.ll 2012-11-28 17:25:24.652007989 -0500 +@@ -48,6 +48,7 @@ + + #include <sys/types.h> + #include <unistd.h> ++#include <unistd.h> + + #include "cmd-edit.h" + #include "quit.h" +--- a/libinterp/interpfcn/oct-hist.cc~ 2012-10-01 18:28:21.000000000 -0400 ++++ b/libinterp/interpfcn/oct-hist.cc 2012-11-28 17:30:46.296796575 -0500 +@@ -44,6 +44,7 @@ + + #include <sys/types.h> + #include <unistd.h> ++#include <unistd.h> + + #include "cmd-hist.h" + #include "file-ops.h" +--- a/libinterp/interpfcn/sysdep.cc 2012-09-19 15:28:19.000000000 -0400 ++++ b/libinterp/interpfcn/sysdep.cc 2012-11-28 17:32:34.109039479 -0500 +@@ -35,6 +35,7 @@ + + #include <sys/types.h> + #include <unistd.h> ++#include <unistd.h> + + #if defined (HAVE_TERMIOS_H) + #include <termios.h>
--- a/src/octave.mk +++ b/src/octave.mk @@ -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