Mercurial > mxe-octave

changeset 2941:8f0c44add205

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename octave-stable to stable-octave to avoid conflict with patch file
author John W. Eaton <jwe@octave.org>
date Fri, 04 Jan 2013 14:48:15 -0500
parents fa2beb4c25a5
children 4b484be8aaf3
files index.html src/octave-stable-1-fixes.patch src/octave-stable.mk src/stable-octave-1-fixes.patch src/stable-octave.mk
diffstat 5 files changed, 62 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Thu Jan 03 16:13:19 2013 -0500
+++ b/index.html	Fri Jan 04 14:48:15 2013 -0500
@@ -1699,9 +1699,9 @@
         <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>
+        <td id="stable-octave-package">stable-octave</td>
+        <td id="stable-octave-version">3.6.4-rc1</td>
+        <td id="stable-octave-website"><a href="http://octave.org/">Octave</a></td>
     </tr>
     <tr>
         <td id="ogg-package">ogg</td>
--- a/src/octave-stable-1-fixes.patch	Thu Jan 03 16:13:19 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
---- 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@
--- a/src/octave-stable.mk	Thu Jan 03 16:13:19 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# 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-stable install
-endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-1-fixes.patch	Fri Jan 04 14:48:15 2013 -0500
@@ -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@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave.mk	Fri Jan 04 14:48:15 2013 -0500
@@ -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-stable install
+endef