changeset 3120:30a5052213e6

octave-stable: build stable version of Octave
author John W. Eaton <jwe@octave.org>
date Thu, 03 Jan 2013 15:48:04 -0500
parents d69349f4d818
children fa2beb4c25a5
files index.html src/octave-stable-1-fixes.patch src/octave-stable.mk
diffstat 3 files changed, 64 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/index.html
+++ b/index.html
@@ -1699,6 +1699,11 @@
         <td id="octave-website"><a href="http://octave.org/">Octave</a></td>
     </tr>
     <tr>
+        <td id="octave-stable-package">octave-stable</td>
+        <td id="octave-stable-version">3.6.4-rc1</td>
+        <td id="octave-stable-website"><a href="http://octave.org/">Octave</a></td>
+    </tr>
+    <tr>
         <td id="ogg-package">ogg</td>
         <td id="ogg-version">1.3.0</td>
         <td id="ogg-website"><a href="http://www.xiph.org/ogg/">OGG</a></td>
new file mode 100644
--- /dev/null
+++ b/src/octave-stable-1-fixes.patch
@@ -0,0 +1,27 @@
+--- a/libgnu/unistd.in.h	2012-12-03 12:57:36.000000000 -0500
++++ b/libgnu/unistd.in.h	2012-12-03 14:22:38.421760035 -0500
+@@ -19,23 +19,7 @@
+ #endif
+ @PRAGMA_COLUMNS@
+ 
+-/* Special invocation convention:
+-   - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
+-     but we need to ensure that both the system <unistd.h> and <winsock2.h>
+-     are completely included before we replace gethostname.  */
+-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+-  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
+-/* <unistd.h> is being indirectly included for the first time from
+-   <winsock2.h>; avoid declaring any overrides.  */
+-# if @HAVE_UNISTD_H@
+-#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+-# else
+-#  error unexpected; report this to bug-gnulib@gnu.org
+-# endif
+-# define _GL_WINSOCK2_H_WITNESS
+-
+-/* Normal invocation.  */
+-#elif !defined _@GUARD_PREFIX@_UNISTD_H
++#if !defined _@GUARD_PREFIX@_UNISTD_H
+ 
+ /* The include_next requires a split double-inclusion guard.  */
+ #if @HAVE_UNISTD_H@
new file mode 100644
--- /dev/null
+++ b/src/octave-stable.mk
@@ -0,0 +1,32 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := octave-stable
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 543d0c9e9a6c5406004b86a803c34711f0cdfcdf
+$(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
+$(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
+$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
+    echo $($(PKG)_VERSION)
+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)' \
+        FLTK_CONFIG="$(PREFIX)/bin/$(TARGET)-fltk-config" \
+        gl_cv_func_gettimeofday_clobber=no
+
+    ## We want both of these install steps so that we install in the
+    ## location set by the configure --prefix option, and the other
+    ## in a directory tree that will have just Octave files.
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(PREFIX)/../octave install
+endef