Mercurial > mxe-octave
changeset 3611:5ab3fc53d7a5
Add enable/disable-stable configure option
* Makefile.in: set stable build dependant on configure variable ENABLE_STABLE.
* configure.ac: add --enable-stable arg.
* src/octave.mk: set devel octave to 3.8.2-rc1
| author | John Donoghue |
|---|---|
| date | Tue, 10 Jun 2014 11:35:10 -0400 |
| parents | 566fd51378f2 |
| children | 77f953f0ec6d |
| files | Makefile.in configure.ac src/octave.mk |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Jun 09 08:00:17 2014 -0400 +++ b/Makefile.in Tue Jun 10 11:35:10 2014 -0400 @@ -1,7 +1,7 @@ # This file is part of MXE. # See index.html for further information. -STABLE_BUILD := yes +STABLE_BUILD := @ENABLE_STABLE@ ifeq ($(STABLE_BUILD),yes) OCTAVE_TARGET := stable-octave
--- a/configure.ac Mon Jun 09 08:00:17 2014 -0400 +++ b/configure.ac Tue Jun 10 11:35:10 2014 -0400 @@ -139,6 +139,13 @@ [if test "$enableval" = yes; then ENABLE_OPENBLAS=yes; fi], []) AC_SUBST(ENABLE_OPENBLAS) +ENABLE_STABLE=yes +AC_ARG_ENABLE(stable, + [AS_HELP_STRING([--enable-stable], + [Enable stable build of octave instead of devel octave])], + [if test "$enableval" = no; then ENABLE_STABLE=no; fi], []) +AC_SUBST(ENABLE_STABLE) + ### Default is to cross compile for mingw. echo $host_alias
--- a/src/octave.mk Mon Jun 09 08:00:17 2014 -0400 +++ b/src/octave.mk Tue Jun 10 11:35:10 2014 -0400 @@ -3,11 +3,11 @@ PKG := octave $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.0 -$(PKG)_CHECKSUM := 7dc2736d05fef50e4f7b3e1b9ab83c8287e8f267 +$(PKG)_VERSION := 3.8.2-rc1 +$(PKG)_CHECKSUM := face1114dd7c7a04392a23c4ce2d916c999e0ed4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE) +$(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE) ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif