Mercurial > mxe-octave
changeset 2975:839a571d0b1d
update to new snapshot version of Octave
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 10 Feb 2013 01:53:55 -0500 |
| parents | 91c9957508d4 |
| children | a6cdc75d044b |
| files | index.html src/octave-1-fixes.patch src/octave-2-fixes.patch src/octave-3-fixes.patch src/octave-4-fixes.patch src/octave-5-fixes.patch src/octave-6-fixes.patch src/octave-7-fixes.patch src/octave.mk |
| diffstat | 9 files changed, 2 insertions(+), 610 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Wed Feb 06 16:38:02 2013 -0500 +++ b/index.html Sun Feb 10 01:53:55 2013 -0500 @@ -1810,7 +1810,7 @@ </tr> <tr> <td id="octave-package">octave</td> - <td id="octave-version">3.7.1</td> + <td id="octave-version">3.7.2</td> <td id="octave-website"><a href="http://octave.org/">Octave</a></td> </tr> <tr>
--- a/src/octave-1-fixes.patch Wed Feb 06 16:38:02 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-2-fixes.patch Wed Feb 06 16:38:02 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ ---- a/libinterp/octave.cc -+++ b/libinterp/octave.cc -@@ -656,6 +656,8 @@ - { - octave_process_command_line (argc, argv); - -+ sysdep_init (); -+ - install_defaults (); - - octave_initialize_interpreter (argc, argv, embedded); -@@ -861,8 +863,6 @@ - - init_signals (); - -- sysdep_init (); -- - octave_ieee_init (); - - // The idea here is to force xerbla to be referenced so that we will ---- a/src/Makefile.am 2012-10-01 12:52:07.000000000 -0400 -+++ b/src/Makefile.am 2013-01-04 14:38:19.879050447 -0500 -@@ -25,9 +25,10 @@ - -I$(top_srcdir)/liboctave/array \ - -I$(top_srcdir)/liboctave/cruft/misc \ - -I$(top_srcdir)/liboctave/numeric \ -+ -I$(top_srcdir)/liboctave/system \ - -I$(top_srcdir)/liboctave/util \ - -I$(top_srcdir)/libinterp \ -- -I$(top_builddir)/libinterp/interpfcn \ -+ -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ - -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu - - AM_CFLAGS += $(WARN_CFLAGS) ---- a/src/Makefile.in 2013-01-02 19:19:08.000000000 -0500 -+++ b/src/Makefile.in 2013-01-04 15:50:45.019717585 -0500 -@@ -1841,9 +1841,10 @@ - -I$(top_srcdir)/liboctave/array \ - -I$(top_srcdir)/liboctave/cruft/misc \ - -I$(top_srcdir)/liboctave/numeric \ -+ -I$(top_srcdir)/liboctave/system \ - -I$(top_srcdir)/liboctave/util \ - -I$(top_srcdir)/libinterp \ -- -I$(top_builddir)/libinterp/interpfcn \ -+ -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ - -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu - - EXTRA_DIST = \ -diff --git a/src/main-cli.cc b/src/main-cli.cc ---- a/src/main-cli.cc -+++ b/src/main-cli.cc -@@ -26,12 +26,15 @@ - - #include "defaults.h" - #include "octave.h" -+#include "sysdep.h" - - int - main (int argc, char **argv) - { - octave_process_command_line (argc, argv); - -+ sysdep_init (); -+ - install_defaults (); - - octave_initialize_interpreter (argc, argv, 0); -diff --git a/src/main.cc b/src/main.cc ---- a/src/main.cc -+++ b/src/main.cc -@@ -27,6 +27,7 @@ - #include "defaults.h" - #include "octave.h" - #include "octave-gui.h" -+#include "sysdep.h" - - int - main (int argc, char **argv) -@@ -35,6 +36,8 @@ - - octave_process_command_line (argc, argv); - -+ sysdep_init (); -+ - install_defaults (); - - if (octave_starting_gui ())
--- a/src/octave-3-fixes.patch Wed Feb 06 16:38:02 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,151 +0,0 @@ -diff --git a/build-aux/common.mk b/build-aux/common.mk ---- a/build-aux/common.mk -+++ b/build-aux/common.mk -@@ -1,3 +1,5 @@ -+CROSS_TOOL_PREFIX = @CROSS_TOOL_PREFIX@ -+ - AWK = @AWK@ - export AWK - -@@ -154,6 +156,13 @@ - - NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@ - -+MKOCTFILE_CC = @MKOCTFILE_CC@ -+MKOCTFILE_CXX = @MKOCTFILE_CXX@ -+MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@ -+MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@ -+MKOCTFILE_F77 = @MKOCTFILE_F77@ -+MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@ -+ - # List of libraries and their special compilation flags - - LIBOCTINTERP = @LIBOCTINTERP@ -@@ -563,7 +572,12 @@ - -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \ -- -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \ - -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ - -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ - -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1811,6 +1811,34 @@ - AC_SUBST(LIBOCTINTERP) - AC_SUBST(LIBOCTAVE) - -+ -+if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then -+ CROSS_TOOL_PREFIX="$ac_tool_prefix" -+ MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")' -+ MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' -+ MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")' -+ MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")' -+ MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' -+else -+ MKOCTFILE_CC="$CC" -+ MKOCTFILE_CXX="$CXX" -+ MKOCTFILE_DL_LD="$DL_LD" -+ MKOCTFILE_F77="$F77" -+ MKOCTFILE_LD_CXX="$LD_CXX" -+fi -+AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) -+AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC]) -+AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX]) -+AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD]) -+AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77]) -+AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX]) -+AC_SUBST(CROSS_TOOL_PREFIX) -+AC_SUBST(MKOCTFILE_CC) -+AC_SUBST(MKOCTFILE_CXX) -+AC_SUBST(MKOCTFILE_DL_LD) -+AC_SUBST(MKOCTFILE_F77) -+AC_SUBST(MKOCTFILE_LD_CXX) -+ - ### Check for existence of various libraries - - ## OS-specific test for dirent, opendir. -diff --git a/src/mkoctfile.in.cc b/src/mkoctfile.in.cc ---- a/src/mkoctfile.in.cc -+++ b/src/mkoctfile.in.cc -@@ -202,13 +202,13 @@ - - vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%); - vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS); -- vars["F77"] = get_variable ("F77", %OCTAVE_CONF_F77%); -+ vars["F77"] = get_variable ("F77", %OCTAVE_CONF_MKOCTFILE_F77%); - vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%); - vars["FPICFLAG"] = get_variable ("FPICFLAG", %OCTAVE_CONF_FPICFLAG%); -- vars["CC"] = get_variable ("CC", %OCTAVE_CONF_CC%); -+ vars["CC"] = get_variable ("CC", %OCTAVE_CONF_MKOCTFILE_CC%); - vars["CFLAGS"] = get_variable ("CFLAGS", %OCTAVE_CONF_CFLAGS%); - vars["CPICFLAG"] = get_variable ("CPICFLAG", %OCTAVE_CONF_CPICFLAG%); -- vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_CXX%); -+ vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%); - vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%); - vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%); - vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%); -@@ -217,7 +217,7 @@ - vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%); - vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%); - -- vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_DL_LD%); -+ vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%); - vars["DL_LDFLAGS"] = get_variable ("DL_LDFLAGS", %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%); - - vars["RDYNAMIC_FLAG"] = get_variable ("RDYNAMIC_FLAG", %OCTAVE_CONF_RDYNAMIC_FLAG%); -@@ -236,7 +236,7 @@ - vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%); - vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%); - -- vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_LD_CXX%); -+ vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%); - vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%); - vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%); - vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LFLAGS); -diff --git a/src/mkoctfile.in.sh b/src/mkoctfile.in.sh ---- a/src/mkoctfile.in.sh -+++ b/src/mkoctfile.in.sh -@@ -67,13 +67,13 @@ - - : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%} - : ${INCFLAGS=$DEFAULT_INCFLAGS} --: ${F77=%OCTAVE_CONF_F77%} -+: ${F77=%OCTAVE_CONF_MKOCTFILE_F77%} - : ${FFLAGS=%OCTAVE_CONF_FFLAGS%} - : ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%} --: ${CC=%OCTAVE_CONF_CC%} -+: ${CC=%OCTAVE_CONF_MKOCTFILE_CC%} - : ${CFLAGS=%OCTAVE_CONF_CFLAGS%} - : ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%} --: ${CXX=%OCTAVE_CONF_CXX%} -+: ${CXX=%OCTAVE_CONF_MKOCTFILE_CXX%} - : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%} - : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%} - : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%} -@@ -82,7 +82,7 @@ - : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%} - : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%} - --: ${DL_LD=%OCTAVE_CONF_DL_LD%} -+: ${DL_LD=%OCTAVE_CONF_MKOCTFILE_DL_LD%} - : ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%} - - : ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%} -@@ -101,7 +101,7 @@ - : ${OCTAVE_LINK_OPTS=%OCTAVE_CONF_OCTAVE_LINK_OPTS%} - : ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_DEPS%} - : ${OCT_LINK_OPTS=%OCTAVE_CONF_OCT_LINK_OPTS%} --: ${LD_CXX=%OCTAVE_CONF_LD_CXX%} -+: ${LD_CXX=%OCTAVE_CONF_MKOCTFILE_LD_CXX%} - : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%} - : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%} - : ${LFLAGS=$DEFAULT_LFLAGS}
--- a/src/octave-4-fixes.patch Wed Feb 06 16:38:02 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff --git a/liboctave/util/lo-cutils.h b/liboctave/util/lo-cutils.h ---- a/liboctave/util/lo-cutils.h -+++ b/liboctave/util/lo-cutils.h -@@ -32,6 +32,8 @@ - extern "C" { - #endif - -+#include <sys/types.h> -+ - OCTAVE_API void - octave_qsort (void *base, size_t n, size_t size, - int (*cmp) (const void *, const void *));
--- a/src/octave-5-fixes.patch Wed Feb 06 16:38:02 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,257 +0,0 @@ -# HG changeset patch -# User John W. Eaton <jwe@octave.org> -# Date 1358193328 18000 -# Node ID 60c4ff7396c637310b7cd43084204084bb3d9bab -# Parent 75cea615ade4b3534e3028b5f82b6075b9e84ad0 -* common.mk (MKOCTFILE_AR, MKOCTFILE_RANLIB): New variables. -(do_subst_config_vals): Include MKOCTFILE_AR and MKOCTFILE_RANLIB in -the list of substitutions. -* configure.ac (MKOCTFILE_AR, MKOCTFILE_RANLIB): Additional mkoctfile -values that receive special treatment when cross compiling. -* pkg/private/configure_make.m: Use mkoctfile, not octave_config_info -to get values for CC, CXX, AR, and RANLIB. -* mkoctfile.in.cc, mkoctfile.in.sh (AR, RANLIB): New variables. -Update usage message. - -diff --git a/build-aux/common.mk b/build-aux/common.mk ---- a/build-aux/common.mk -+++ b/build-aux/common.mk -@@ -156,12 +156,14 @@ - - NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@ - -+MKOCTFILE_AR = @MKOCTFILE_AR@ - MKOCTFILE_CC = @MKOCTFILE_CC@ - MKOCTFILE_CXX = @MKOCTFILE_CXX@ - MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@ - MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@ - MKOCTFILE_F77 = @MKOCTFILE_F77@ - MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@ -+MKOCTFILE_RANLIB = @MKOCTFILE_RANLIB@ - - # List of libraries and their special compilation flags - -@@ -572,12 +574,14 @@ - -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \ - -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_AR%|\"${MKOCTFILE_AR}\"|' \ - -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \ - -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \ - -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \ - -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \ - -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \ - -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \ -+ -e 's|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|' \ - -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ - -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ - -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1814,30 +1814,38 @@ - - if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then - CROSS_TOOL_PREFIX="$ac_tool_prefix" -+ MKOCTFILE_AR='$(shell echo $(AR) | sed "s,$(CROSS_TOOL_PREFIX),,")' - MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")' - MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' - MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")' - MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")' - MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' -+ MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | sed "s,$(CROSS_TOOL_PREFIX),,")' - else -+ MKOCTFILE_AR="$AR" - MKOCTFILE_CC="$CC" - MKOCTFILE_CXX="$CXX" - MKOCTFILE_DL_LD="$DL_LD" - MKOCTFILE_F77="$F77" - MKOCTFILE_LD_CXX="$LD_CXX" -+ MKOCTFILE_RANLIB="$RANLIB" - fi - AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) -+AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR]) - AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC]) - AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX]) - AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD]) - AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77]) - AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX]) -+AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB]) - AC_SUBST(CROSS_TOOL_PREFIX) -+AC_SUBST(MKOCTFILE_AR) - AC_SUBST(MKOCTFILE_CC) - AC_SUBST(MKOCTFILE_CXX) - AC_SUBST(MKOCTFILE_DL_LD) - AC_SUBST(MKOCTFILE_F77) - AC_SUBST(MKOCTFILE_LD_CXX) -+AC_SUBST(MKOCTFILE_RANLIB) - - ### Check for existence of various libraries - -diff --git a/scripts/pkg/private/configure_make.m b/scripts/pkg/private/configure_make.m ---- a/scripts/pkg/private/configure_make.m -+++ b/scripts/pkg/private/configure_make.m -@@ -28,11 +28,11 @@ - src = fullfile (packdir, "src"); - octave_bindir = octave_config_info ("bindir"); - ver = version (); -- mkoctfile = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver)); -- octave_config = fullfile (octave_bindir, sprintf ("octave-config-%s", ver)); -+ mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver)); -+ octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s", ver)); - octave_binary = fullfile (octave_bindir, sprintf ("octave-%s", ver)); -- cenv = {"MKOCTFILE"; mkoctfile; -- "OCTAVE_CONFIG"; octave_config; -+ cenv = {"MKOCTFILE"; mkoctfile_program; -+ "OCTAVE_CONFIG"; octave_config_program; - "OCTAVE"; octave_binary; - "INSTALLDIR"; desc.dir}; - scenv = sprintf ("%s=\"%s\" ", cenv{:}); -@@ -40,16 +40,16 @@ - if (exist (fullfile (src, "configure"), "file")) - flags = ""; - if (isempty (getenv ("CC"))) -- flags = cstrcat (flags, " CC=\"", octave_config_info ("CC"), "\""); -+ flags = cstrcat (flags, " CC=\"", mkoctfile ("-p", "CC"), "\""); - endif - if (isempty (getenv ("CXX"))) -- flags = cstrcat (flags, " CXX=\"", octave_config_info ("CXX"), "\""); -+ flags = cstrcat (flags, " CXX=\"", mkoctfile ("-p", "CXX"), "\""); - endif - if (isempty (getenv ("AR"))) -- flags = cstrcat (flags, " AR=\"", octave_config_info ("AR"), "\""); -+ flags = cstrcat (flags, " AR=\"", mkoctfile ("-p", "AR"), "\""); - endif - if (isempty (getenv ("RANLIB"))) -- flags = cstrcat (flags, " RANLIB=\"", octave_config_info ("RANLIB"), "\""); -+ flags = cstrcat (flags, " RANLIB=\"", mkoctfile ("-p", "RANLIB"), "\""); - endif - [status, output] = shell (cstrcat ("cd '", src, "'; ", scenv, - "./configure --prefix=\"", -diff --git a/src/mkoctfile.in.cc b/src/mkoctfile.in.cc ---- a/src/mkoctfile.in.cc -+++ b/src/mkoctfile.in.cc -@@ -214,6 +214,9 @@ - vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%); - vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS", %OCTAVE_CONF_XTRA_CXXFLAGS%); - -+ vars["AR"] = get_variable ("AR", %OCTAVE_CONF_MKOCTFILE_AR%); -+ vars["RANLIB"] = get_variable ("RANLIB", %OCTAVE_CONF_MKOCTFILE_RANLIB%); -+ - vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%); - vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%); - -@@ -299,30 +302,29 @@ - " -p VAR, --print VAR Print configuration variable VAR. Recognized\n" - " variables are:\n" - "\n" --" ALL_CFLAGS FLIBS\n" --" ALL_CXXFLAGS FPICFLAG\n" --" ALL_FFLAGS INCFLAGS\n" --" ALL_LDFLAGS LAPACK_LIBS\n" --" BLAS_LIBS LDFLAGS\n" --" CC LD_CXX\n" --" CFLAGS LD_STATIC_FLAG\n" --" CPICFLAG LFLAGS\n" --" CPPFLAGS LIBOCTAVE\n" --" CXX LIBOCTINTERP\n" --" CXXFLAGS LIBS\n" --" CXXPICFLAG OCTAVE_LIBS\n" --" DEPEND_EXTRA_SED_PATTERN OCTAVE_LINK_DEPS\n" --" DEPEND_FLAGS OCTAVE_LINK_OPTS\n" --" DL_LD OCT_LINK_DEPS\n" --" DL_LDFLAGS OCT_LINK_OPTS\n" --" EXEEXT RDYNAMIC_FLAG\n" --" F77 READLINE_LIBS\n" --" F77_INTEGER_8_FLAG SED\n" --" FFLAGS XTRA_CFLAGS\n" --" FFTW3_LDFLAGS XTRA_CXXFLAGS\n" --" FFTW3_LIBS\n" --" FFTW3F_LDFLAGS\n" --" FFTW3F_LIBS\n" -+" ALL_CFLAGS FFTW3F_LDFLAGS\n" -+" ALL_CXXFLAGS FFTW3F_LIBS\n" -+" ALL_FFLAGS FLIBS\n" -+" ALL_LDFLAGS FPICFLAG\n" -+" AR INCFLAGS\n" -+" BLAS_LIBS LAPACK_LIBS\n" -+" CC LDFLAGS\n" -+" CFLAGS LD_CXX\n" -+" CPICFLAG LD_STATIC_FLAG\n" -+" CPPFLAGS LFLAGS\n" -+" CXX LIBOCTAVE\n" -+" CXXFLAGS LIBOCTINTERP\n" -+" CXXPICFLAG LIBS\n" -+" DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n" -+" DEPEND_FLAGS OCTAVE_LINK_DEPS\n" -+" DL_LD OCT_LINK_DEPS\n" -+" DL_LDFLAGS RANLIB\n" -+" EXEEXT RDYNAMIC_FLAG\n" -+" F77 READLINE_LIBS\n" -+" F77_INTEGER_8_FLAG SED\n" -+" FFLAGS XTRA_CFLAGS\n" -+" FFTW3_LDFLAGS XTRA_CXXFLAGS\n" -+" FFTW3_LIBS\n" - "\n" - " --link-stand-alone Link a stand-alone executable file.\n" - "\n" -diff --git a/src/mkoctfile.in.sh b/src/mkoctfile.in.sh ---- a/src/mkoctfile.in.sh -+++ b/src/mkoctfile.in.sh -@@ -79,6 +79,9 @@ - : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%} - : ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%} - -+: ${AR=%OCTAVE_CONF_MKOCTFILE_AR%} -+: ${RANLIB=%OCTAVE_CONF_MKOCTFILE_RANLIB%} -+ - : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%} - : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%} - -@@ -233,29 +236,30 @@ - -p VAR, --print VAR Print configuration variable VAR. Recognized - variables are: - -- ALL_CFLAGS FFTW3F_LIBS -- ALL_CXXFLAGS FLIBS -- ALL_FFLAGS FPICFLAG -- ALL_LDFLAGS INCFLAGS -+ ALL_CFLAGS FFTW3F_LDFLAGS -+ ALL_CXXFLAGS FFTW3F_LIBS -+ ALL_FFLAGS FLIBS -+ ALL_LDFLAGS FPICFLAG -+ AR INCFLAGS - BLAS_LIBS LAPACK_LIBS - CC LDFLAGS - CFLAGS LD_CXX - CPICFLAG LD_STATIC_FLAG - CPPFLAGS LFLAGS -- CXX LIBOCTAVE -- CXXFLAGS LIBOCTINTERP -- CXXPICFLAG LIBS -- DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS -+ CXX LIBOCTAVE -+ CXXFLAGS LIBOCTINTERP -+ CXXPICFLAG LIBS -+ DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS - DEPEND_FLAGS OCTAVE_LINK_DEPS -- DL_LD OCT_LINK_DEPS -- DL_LDFLAGS RDYNAMIC_FLAG -- EXEEXT READLINE_LIBS -- F77 SED -- F77_INTEGER_8_FLAG XTRA_CFLAGS -- FFLAGS XTRA_CXXFLAGS -- FFTW3_LDFLAGS -+ DL_LD OCT_LINK_DEPS -+ DL_LDFLAGS RANLIB -+ EXEEXT RDYNAMIC_FLAG -+ F77 READLINE_LIBS -+ F77_INTEGER_8_FLAG SED -+ FFLAGS XTRA_CFLAGS -+ FFTW3_LDFLAGS XTRA_CXXFLAGS - FFTW3_LIBS -- FFTW3F_LDFLAGS -+ - - -v, --verbose Echo commands as they are executed. -
--- a/src/octave-6-fixes.patch Wed Feb 06 16:38:02 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -diff -uNr a/scripts/miscellaneous/edit.m b/scripts/miscellaneous/edit.m ---- a/scripts/miscellaneous/edit.m 2012-11-13 12:31:48.000000000 -0500 -+++ b/scripts/miscellaneous/edit.m 2013-01-24 17:37:50.597434926 -0500 -@@ -243,10 +243,11 @@ - if (nargin < 1) - if (exist (FUNCTION.HOME, "dir") == 7 && (isunix () || ! ispc ())) - system (cstrcat ("cd \"", FUNCTION.HOME, "\" ; ", -- sprintf (FUNCTION.EDITOR, "")), -+ sprintf (undo_string_escapes (FUNCTION.EDITOR), "")), - [], FUNCTION.MODE); - else -- system (sprintf (FUNCTION.EDITOR,""), [], FUNCTION.MODE); -+ system (sprintf (undo_string_escapes (FUNCTION.EDITOR), ""), -+ [], FUNCTION.MODE); - endif - return; - endif -@@ -328,7 +329,8 @@ - ## If the file exists, then edit it. - if (FUNCTION.EDITINPLACE) - ## Edit in place even if it is protected. -- system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")), -+ system (sprintf (undo_string_escapes (FUNCTION.EDITOR), -+ cstrcat ("\"", fileandpath, "\"")), - [], FUNCTION.MODE); - return; - else -@@ -345,7 +347,8 @@ - else - fclose (fid); - endif -- system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")), -+ system (sprintf (undo_string_escapes (FUNCTION.EDITOR), -+ cstrcat ("\"", fileandpath, "\"")), - [], FUNCTION.MODE); - return; - endif -@@ -361,7 +364,8 @@ - case {"cc", "m"} - 0; - otherwise -- system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")), -+ system (sprintf (undo_string_escapes (FUNCTION.EDITOR), -+ cstrcat ("\"", fileandpath, "\"")), - [], FUNCTION.MODE); - return; - endswitch -@@ -512,7 +516,8 @@ - fclose (fid); - - ## Finally we are ready to edit it! -- system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")), -+ system (sprintf (undo_string_escapes (FUNCTION.EDITOR), -+ cstrcat ("\"", fileandpath, "\"")), - [], FUNCTION.MODE); - - endif
--- a/src/octave-7-fixes.patch Wed Feb 06 16:38:02 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -1537,7 +1537,12 @@ - dnl exist which will then fool the 'test -z' line. - AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, []) - if test -z "$MKINFO"; then -- AC_MSG_ERROR([makeinfo program required for reading documentation]) -+ warn_makeinfo=" -+ -+I didn't find makeinfo, which is required for reading documentation. -+You may install a copy later for Octave to use. -+" -+ OCTAVE_CONFIGURE_WARNING([warn_makeinfo]) - fi - ]) - dnl
--- a/src/octave.mk Wed Feb 06 16:38:02 2013 -0500 +++ b/src/octave.mk Sun Feb 10 01:53:55 2013 -0500 @@ -3,7 +3,7 @@ PKG := octave $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 658a079ac498309d5aa5a2556f53a7856fcde938 +$(PKG)_CHECKSUM := b80caa6ac6f206cfe06f8f7dd45650074cebac2a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)