Mercurial > mxe-octave
changeset 5208:fc8236cf04d5
of-linear-algebra: update to 2.2.3
* dist-files.mk: update for removed files
* src/of-linear-algebra.mk: update version, checksum, subdir
* src/of-linear-algebra-1-cross-fixes.patch,
src/of-linear-algebra-2-dev-fixes.patch,
src/of-linear-algebra-3-fixes.patch,
src/of-linear-algebra-4-fixes.patch,
src/of-linear-algebra-5-deprecated.patch: deleted
| author | John Donoghue |
|---|---|
| date | Thu, 14 Nov 2019 08:06:49 -0500 |
| parents | 5ecb037169fc |
| children | 6a3f14fd9d0d |
| files | dist-files.mk src/of-linear-algebra-1-cross-fixes.patch src/of-linear-algebra-2-dev-fixes.patch src/of-linear-algebra-3-fixes.patch src/of-linear-algebra-4-fixes.patch src/of-linear-algebra-5-deprecated.patch src/of-linear-algebra.mk |
| diffstat | 7 files changed, 4 insertions(+), 1223 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Thu Nov 14 08:06:48 2019 -0500 +++ b/dist-files.mk Thu Nov 14 08:06:49 2019 -0500 @@ -484,11 +484,6 @@ of-interval-1-cross-fixes.patch \ of-interval.mk \ of-io.mk \ - of-linear-algebra-1-cross-fixes.patch \ - of-linear-algebra-2-dev-fixes.patch \ - of-linear-algebra-3-fixes.patch \ - of-linear-algebra-4-fixes.patch \ - of-linear-algebra-5-deprecated.patch \ of-linear-algebra.mk \ of-lssa.mk \ of-ltfat-1-cross-fixes.patch \
--- a/src/of-linear-algebra-1-cross-fixes.patch Thu Nov 14 08:06:48 2019 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,701 +0,0 @@ -diff -ur linear-algebra.orig/src/configure linear-algebra/src/configure ---- linear-algebra.orig/src/configure 2015-04-28 07:57:58.455790565 -0400 -+++ linear-algebra/src/configure 2015-04-28 07:59:16.904304093 -0400 -@@ -1,11 +1,9 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.68. -+# Generated by GNU Autoconf 2.69. - # - # --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software --# Foundation, Inc. -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. - # - # - # This configure script is free software; the Free Software Foundation -@@ -134,6 +132,31 @@ - # CDPATH. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} - if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh -@@ -167,7 +190,8 @@ - else - exitcode=1; echo positional parameters were not saved. - fi --test x\$exitcode = x0 || exit 1" -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -@@ -211,21 +235,25 @@ - - - if test "x$CONFIG_SHELL" != x; then : -- # We cannot yet assume a decent shell, so we have to provide a -- # neutralization value for shells without unset; and this also -- # works around shells that cannot unset nonexistent variables. -- # Preserve -v and -x to the replacement shell. -- BASH_ENV=/dev/null -- ENV=/dev/null -- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -- export CONFIG_SHELL -- case $- in # (((( -- *v*x* | *x*v* ) as_opts=-vx ;; -- *v* ) as_opts=-v ;; -- *x* ) as_opts=-x ;; -- * ) as_opts= ;; -- esac -- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 - fi - - if test x$as_have_required = xno; then : -@@ -327,6 +355,14 @@ - - - } # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p - # as_fn_append VAR VALUE - # ---------------------- - # Append the text in VALUE to the end of the definition contained in VAR. Take -@@ -448,6 +484,10 @@ - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). -@@ -482,16 +522,16 @@ - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -503,28 +543,8 @@ - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -587,6 +607,7 @@ - mpath - subver - ver -+OCTAVE_CONFIG - MKOCTFILE - OBJEXT - EXEEXT -@@ -1110,8 +1131,6 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -1347,9 +1366,9 @@ - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.68 -+generated by GNU Autoconf 2.69 - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1402,7 +1421,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -@@ -1660,7 +1679,7 @@ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "failed to load site script $ac_site_file --See \`config.log' for more details" "$LINENO" 5 ; } -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - -@@ -1787,7 +1806,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -1827,7 +1846,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -1880,7 +1899,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -1921,7 +1940,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -1979,7 +1998,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2023,7 +2042,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2066,7 +2085,7 @@ - test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "no acceptable C compiler found in \$PATH --See \`config.log' for more details" "$LINENO" 5 ; } -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. - $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -@@ -2181,7 +2200,7 @@ - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error 77 "C compiler cannot create executables --See \`config.log' for more details" "$LINENO" 5 ; } -+See \`config.log' for more details" "$LINENO" 5; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -@@ -2224,7 +2243,7 @@ - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details" "$LINENO" 5 ; } -+See \`config.log' for more details" "$LINENO" 5; } - fi - rm -f conftest conftest$ac_cv_exeext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -@@ -2283,7 +2302,7 @@ - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run C compiled programs. - If you meant to cross compile, use \`--host'. --See \`config.log' for more details" "$LINENO" 5 ; } -+See \`config.log' for more details" "$LINENO" 5; } - fi - fi - fi -@@ -2335,7 +2354,7 @@ - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot compute suffix of object files: cannot compile --See \`config.log' for more details" "$LINENO" 5 ; } -+See \`config.log' for more details" "$LINENO" 5; } - fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi -@@ -2469,8 +2488,7 @@ - /* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -2575,7 +2593,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_MKOCTFILE="mkoctfile" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2598,6 +2616,45 @@ - - test -z "$MKOCTFILE" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no mkoctfile found on path" >&5 - $as_echo "$as_me: WARNING: no mkoctfile found on path" >&2;} -+# Extract the first word of "octave-config", so it can be a program name with args. -+set dummy octave-config; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_OCTAVE_CONFIG+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$OCTAVE_CONFIG"; then -+ ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_OCTAVE_CONFIG="octave-config" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG -+if test -n "$OCTAVE_CONFIG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5 -+$as_echo "$OCTAVE_CONFIG" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+test -z "$OCTAVE_CONFIG" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no octave-config found on path" >&5 -+$as_echo "$as_me: WARNING: no octave-config found on path" >&2;} - - - -@@ -2777,6 +2834,8 @@ - - - -+ -+ - # Extract the first word of "octave", so it can be a program name with args. - set dummy octave; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -@@ -2793,7 +2852,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OCTAVE="octave" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2814,25 +2873,25 @@ - fi - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTAVE_VERSION in Octave" >&5 --$as_echo_n "checking for OCTAVE_VERSION in Octave... " >&6; } --OCTAVE_VERSION=`echo "disp(OCTAVE_VERSION)" | $OCTAVE -qf` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VERSION in octave-config" >&5 -+$as_echo_n "checking for VERSION in octave-config... " >&6; } -+OCTAVE_VERSION=`$OCTAVE_CONFIG -p VERSION` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_VERSION" >&5 - $as_echo "$OCTAVE_VERSION" >&6; } - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('canonical_host_type') in Octave" >&5 --$as_echo_n "checking for octave_config_info('canonical_host_type') in Octave... " >&6; } --canonical_host_type=`echo "disp(octave_config_info('canonical_host_type'))" | $OCTAVE -qf` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5 -+$as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; } -+canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $canonical_host_type" >&5 - $as_echo "$canonical_host_type" >&6; } - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('SHLEXT') in Octave" >&5 --$as_echo_n "checking for octave_config_info('SHLEXT') in Octave... " >&6; } --SHLEXT=`echo "disp(octave_config_info('SHLEXT'))" | $OCTAVE -qf` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHLEXT in octave-config" >&5 -+$as_echo_n "checking for SHLEXT in octave-config... " >&6; } -+SHLEXT=`$OCTAVE_CONFIG -p SHLEXT` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5 - $as_echo "$SHLEXT" >&6; } - -@@ -2867,7 +2926,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2907,7 +2966,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2968,7 +3027,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="$STRIP" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3018,7 +3077,8 @@ - - octave-forge is configured with - octave: $OCTAVE (version $OCTAVE_VERSION) -- mkoctfile: $MKOCTFILE for Octave $subver" -+ mkoctfile: $MKOCTFILE for Octave $subver -+ octave-config: $OCTAVE_CONFIG for Octave $subver" - ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS" - - -@@ -3380,16 +3440,16 @@ - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -3449,28 +3509,16 @@ - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -3492,7 +3540,7 @@ - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -3545,10 +3593,10 @@ - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.68, -+configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -3625,7 +3673,7 @@ - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' -@@ -3656,7 +3704,7 @@ - case $ac_config_target in - "$CONFIGURE_OUTPUTS") CONFIG_FILES="$CONFIG_FILES $CONFIGURE_OUTPUTS" ;; - -- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -@@ -3864,7 +3912,7 @@ - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -@@ -3892,7 +3940,7 @@ - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" -@@ -3919,7 +3967,7 @@ - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ -- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac -diff -ur linear-algebra.orig/src/configure.base linear-algebra/src/configure.base ---- linear-algebra.orig/src/configure.base 2015-04-28 07:57:58.456790584 -0400 -+++ linear-algebra/src/configure.base 2015-04-28 07:59:16.905304112 -0400 -@@ -49,6 +49,8 @@ - dnl Check for mkoctfile - AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) - test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) -+AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config) -+test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path]) - - AC_SUBST(ver) - AC_SUBST(subver) -@@ -257,15 +259,22 @@ - fi - ]) - -+AC_DEFUN(OCTAVE_CONFIG_EVAL, -+[AC_MSG_CHECKING([for $1 in octave-config]) -+$2=`$OCTAVE_CONFIG -p $1` -+AC_MSG_RESULT($$2) -+AC_SUBST($2) -+]) -+ - dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version - AC_CHECK_PROG(OCTAVE,octave,octave) --OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION) -+OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION) - - dnl grab canonical host type so we can write system specific install stuff --OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type) -+OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type) - - dnl grab SHLEXT from octave config --OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT) -+OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT) - - AC_PROG_LN_S - -@@ -316,4 +325,5 @@ - - octave-forge is configured with - octave: $OCTAVE (version $OCTAVE_VERSION) -- mkoctfile: $MKOCTFILE for Octave $subver" -+ mkoctfile: $MKOCTFILE for Octave $subver -+ octave-config: $OCTAVE_CONFIG for Octave $subver" -diff -ur linear-algebra.orig/src/Makeconf.in linear-algebra/src/Makeconf.in ---- linear-algebra.orig/src/Makeconf.in 2015-04-28 07:57:58.456790584 -0400 -+++ linear-algebra/src/Makeconf.in 2015-04-28 07:59:16.905304112 -0400 -@@ -52,6 +52,7 @@ - OCTAVE = @OCTAVE@ - OCTAVE_VERSION = @OCTAVE_VERSION@ - MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v -+OCTAVE_CONFIG = @OCTAVE_CONFIG@ - SHLEXT = @SHLEXT@ - - ver = @ver@ -diff -ur linear-algebra.orig/src/Makefile linear-algebra/src/Makefile ---- linear-algebra.orig/src/Makefile 2015-04-28 07:57:58.455790565 -0400 -+++ linear-algebra/src/Makefile 2015-04-28 08:09:03.787626987 -0400 -@@ -1,7 +1,7 @@ - sinclude Makeconf - - ifndef OCTAVE_FORGE --MKOCTFILE = mkoctfile -+MKOCTFILE ?= mkoctfile - endif - - ifndef LAPACK_LIBS -@@ -21,7 +21,7 @@ - - OBJECTS = $(GSVD_OBJECTS) - TARGETS = $(GSVD_TARGET) --DEPENDS = $(GSVD_DEPENDS) -+#DEPENDS = $(GSVD_DEPENDS) - - .PHONY: all test clean count - -@@ -44,7 +44,6 @@ - $(MKOCTFILE) $(DEFINES) -M $< - - %.o:%.cc --%.o:%.cc %.d - $(MKOCTFILE) $(DEFINES) -c $< - - %.o:%.f -@@ -53,7 +52,7 @@ - $(MKOCTFILE) $(DEFINES) $< -o $@ - - %.oct: %.cc -- mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS} -+ $(MKOCTFILE) $(DEFINES) $< -o $@ ${LAPACK_LIBS} - - .phony: test - test: $(GSVD_TEST) -Only in linear-algebra/src: Makefile.orig
--- a/src/of-linear-algebra-2-dev-fixes.patch Thu Nov 14 08:06:48 2019 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,355 +0,0 @@ -diff -ur linear-algebra.orig/src/configure linear-algebra/src/configure ---- linear-algebra.orig/src/configure 2017-07-13 15:57:44.643245981 -0400 -+++ linear-algebra/src/configure 2017-07-13 16:02:41.757621133 -0400 -@@ -599,13 +599,9 @@ - FFLAGS - F77 - CPICFLAG --altopath --altmpath --altpath - xpath - opath - mpath --subver - ver - OCTAVE_CONFIG - MKOCTFILE -@@ -664,9 +660,6 @@ - with_mpath - with_opath - with_xpath --with_altpath --with_altmpath --with_altopath - ' - ac_precious_vars='build_alias - host_alias -@@ -1286,9 +1279,6 @@ - --with-mpath override path for m-files - --with-opath override path for oct-files - --with-xpath override path for executables -- --with-altpath alternative functions install path prefix -- --with-altmpath override path for alternative m-files -- --with-altopath override path for alternative oct-files - - Some influential environment variables: - CC C compiler command -@@ -2662,10 +2652,6 @@ - - - -- -- -- -- - # Check whether --with-path was given. - if test "${with_path+set}" = set; then : - withval=$with_path; path=$withval -@@ -2690,86 +2676,10 @@ - fi - - --# Check whether --with-altpath was given. --if test "${with_altpath+set}" = set; then : -- withval=$with_altpath; altpath=$withval --fi -- -- --# Check whether --with-altmpath was given. --if test "${with_altmpath+set}" = set; then : -- withval=$with_altmpath; altmpath=$withval --fi -- -- --# Check whether --with-altopath was given. --if test "${with_altopath+set}" = set; then : -- withval=$with_altopath; altopath=$withval --fi -- -- - if test -n "$path" ; then - test -z "$mpath" && mpath=$path - test -z "$opath" && opath=$path/oct - test -z "$xpath" && xpath=$path/bin -- test -z "$altpath" && altpath=$path-alternatives --fi -- --if test -n "$altpath" ; then -- test -z "$altmpath" && altmpath=$altpath -- test -z "$altopath" && altopath=$altpath/oct --fi -- --#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then --if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then -- cat > conftest.cc <<EOF --#include <octave/config.h> --#include <octave/version.h> --#include <octave/defaults.h> -- --#define INFOV "\nINFOV=" OCTAVE_VERSION "\n" -- --#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n" -- --#ifdef OCTAVE_LOCALVERFCNFILEDIR --# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n" --#else --# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n" --#endif -- --#ifdef OCTAVE_LOCALVEROCTFILEDIR --# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n" --#else --# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n" --#endif -- --#ifdef OCTAVE_LOCALVERARCHLIBDIR --# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n" --#else --# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n" --#endif -- --const char *infom = INFOM; --const char *infoo = INFOO; --const char *infox = INFOX; --const char *infoh = INFOH; --const char *infov = INFOV; --EOF -- -- $MKOCTFILE conftest.cc || as_fn_error $? "Could not run $MKOCTFILE" "$LINENO" 5 -- -- eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"` -- rm -rf conftest* -- -- ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"` -- subver=`echo $INFOV | sed -e "s/^[^.]*[.][^.]*[.]//"` -- alt_mbase=`echo $INFOM | sed -e "s,\/[^\/]*$,,"` -- alt_obase=`echo $INFOO | sed -e "s,/site.*$,/site,"` -- test -z "$mpath" && mpath=$INFOM/octave-forge -- test -z "$opath" && opath=$INFOO/octave-forge -- test -z "$xpath" && xpath=$INFOX -- test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m -- test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH - fi - - -@@ -2880,6 +2790,7 @@ - $as_echo "$OCTAVE_VERSION" >&6; } - - -+ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"` - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5 - $as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; } -@@ -2897,6 +2808,34 @@ - - - -+if test -z "$mpath"; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCALVERFCNFILEDIR in octave-config" >&5 -+$as_echo_n "checking for LOCALVERFCNFILEDIR in octave-config... " >&6; } -+mpath=`$OCTAVE_CONFIG -p LOCALVERFCNFILEDIR` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mpath" >&5 -+$as_echo "$mpath" >&6; } -+ -+ -+fi -+if test -z "$opath"; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCALVEROCTFILEDIR in octave-config" >&5 -+$as_echo_n "checking for LOCALVEROCTFILEDIR in octave-config... " >&6; } -+opath=`$OCTAVE_CONFIG -p LOCALVEROCTFILEDIR` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $opath" >&5 -+$as_echo "$opath" >&6; } -+ -+ -+fi -+if test -z "$xpath"; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCALVERARCHLIBDIR in octave-config" >&5 -+$as_echo_n "checking for LOCALVERARCHLIBDIR in octave-config... " >&6; } -+xpath=`$OCTAVE_CONFIG -p LOCALVERARCHLIBDIR` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xpath" >&5 -+$as_echo "$xpath" >&6; } -+ -+ -+fi -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 - $as_echo_n "checking whether ln -s works... " >&6; } - LN_S=$as_ln_s -@@ -3065,9 +3004,6 @@ - m-files: $mpath - oct-files: $opath - binaries: $xpath --alternatives: -- m-files: $altmpath -- oct-files: $altopath - - shell commands will install into the following directories: - binaries: $bindir -@@ -3077,8 +3013,8 @@ - - octave-forge is configured with - octave: $OCTAVE (version $OCTAVE_VERSION) -- mkoctfile: $MKOCTFILE for Octave $subver -- octave-config: $OCTAVE_CONFIG for Octave $subver" -+ mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION -+ octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION" - ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS" - - -diff -ur linear-algebra.orig/src/configure.base linear-algebra/src/configure.base ---- linear-algebra.orig/src/configure.base 2017-07-13 15:57:44.644246010 -0400 -+++ linear-algebra/src/configure.base 2017-07-13 16:01:17.552247526 -0400 -@@ -53,13 +53,9 @@ - test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path]) - - AC_SUBST(ver) --AC_SUBST(subver) - AC_SUBST(mpath) - AC_SUBST(opath) - AC_SUBST(xpath) --AC_SUBST(altpath) --AC_SUBST(altmpath) --AC_SUBST(altopath) - - AC_ARG_WITH(path, - [ --with-path install path prefix], -@@ -73,83 +69,11 @@ - AC_ARG_WITH(xpath, - [ --with-xpath override path for executables], - [xpath=$withval]) --AC_ARG_WITH(altpath, -- [ --with-altpath alternative functions install path prefix], -- [ altpath=$withval ]) --AC_ARG_WITH(altmpath, -- [ --with-altmpath override path for alternative m-files], -- [altmpath=$withval]) --AC_ARG_WITH(altopath, -- [ --with-altopath override path for alternative oct-files], -- [altopath=$withval]) - - if test -n "$path" ; then - test -z "$mpath" && mpath=$path - test -z "$opath" && opath=$path/oct - test -z "$xpath" && xpath=$path/bin -- test -z "$altpath" && altpath=$path-alternatives --fi -- --if test -n "$altpath" ; then -- test -z "$altmpath" && altmpath=$altpath -- test -z "$altopath" && altopath=$altpath/oct --fi -- --dnl Don't query if path/ver are given in the configure environment --#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then --if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then -- dnl Construct program to get mkoctfile version and local install paths -- cat > conftest.cc <<EOF --#include <octave/config.h> --#include <octave/version.h> --#include <octave/defaults.h> -- --#define INFOV "\nINFOV=" OCTAVE_VERSION "\n" -- --#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n" -- --#ifdef OCTAVE_LOCALVERFCNFILEDIR --# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n" --#else --# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n" --#endif -- --#ifdef OCTAVE_LOCALVEROCTFILEDIR --# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n" --#else --# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n" --#endif -- --#ifdef OCTAVE_LOCALVERARCHLIBDIR --# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n" --#else --# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n" --#endif -- --const char *infom = INFOM; --const char *infoo = INFOO; --const char *infox = INFOX; --const char *infoh = INFOH; --const char *infov = INFOV; --EOF -- -- dnl Compile program perhaps with a special version of mkoctfile -- $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE) -- -- dnl Strip the config info from the compiled file -- eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"` -- rm -rf conftest* -- -- dnl set the appropriate variables if they are not already set -- ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"` -- subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"` -- alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"` -- alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"` -- test -z "$mpath" && mpath=$INFOM/octave-forge -- test -z "$opath" && opath=$INFOO/octave-forge -- test -z "$xpath" && xpath=$INFOX -- test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m -- test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH - fi - - dnl ******************************************************************* -@@ -269,6 +193,7 @@ - dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version - AC_CHECK_PROG(OCTAVE,octave,octave) - OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION) -+ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"` - - dnl grab canonical host type so we can write system specific install stuff - OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type) -@@ -276,6 +201,16 @@ - dnl grab SHLEXT from octave config - OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT) - -+if test -z "$mpath"; then -+OCTAVE_CONFIG_EVAL(LOCALVERFCNFILEDIR,mpath) -+fi -+if test -z "$opath"; then -+OCTAVE_CONFIG_EVAL(LOCALVEROCTFILEDIR,opath) -+fi -+if test -z "$xpath"; then -+OCTAVE_CONFIG_EVAL(LOCALVERARCHLIBDIR,xpath) -+fi -+ - AC_PROG_LN_S - - AC_PROG_RANLIB -@@ -313,9 +248,6 @@ - m-files: $mpath - oct-files: $opath - binaries: $xpath --alternatives: -- m-files: $altmpath -- oct-files: $altopath - - shell commands will install into the following directories: - binaries: $bindir -@@ -325,5 +257,5 @@ - - octave-forge is configured with - octave: $OCTAVE (version $OCTAVE_VERSION) -- mkoctfile: $MKOCTFILE for Octave $subver -- octave-config: $OCTAVE_CONFIG for Octave $subver" -+ mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION -+ octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION" -diff -ur linear-algebra.orig/src/Makeconf.in linear-algebra/src/Makeconf.in ---- linear-algebra.orig/src/Makeconf.in 2017-07-13 15:57:44.644246010 -0400 -+++ linear-algebra/src/Makeconf.in 2017-07-13 16:01:36.615784895 -0400 -@@ -59,8 +59,6 @@ - MPATH = @mpath@ - OPATH = @opath@ - XPATH = @xpath@ --ALTMPATH = @altmpath@ --ALTOPATH = @altopath@ - - %.o: %.c ; $(MKOCTFILE) -c $< - %.o: %.f ; $(MKOCTFILE) -c $<
--- a/src/of-linear-algebra-3-fixes.patch Thu Nov 14 08:06:48 2019 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -diff -uNr a/src/CmplxGSVD.cc b/src/CmplxGSVD.cc ---- a/src/CmplxGSVD.cc 2015-01-24 14:54:11.000000000 -0500 -+++ b/src/CmplxGSVD.cc 2018-01-09 18:01:22.672116302 -0500 -@@ -14,10 +14,6 @@ - // You should have received a copy of the GNU General Public License along with - // this program; if not, see <http://www.gnu.org/licenses/>. - --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -- - #include <iostream> - - #include "CmplxGSVD.h" -diff -uNr a/src/configure b/src/configure ---- a/src/configure 2018-01-09 18:00:27.978452208 -0500 -+++ b/src/configure 2018-01-09 18:02:12.066006875 -0500 -@@ -2720,7 +2720,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for F77_FUNC" >&5 - $as_echo_n "checking for F77_FUNC... " >&6; } - cat > conftest.cc << EOF --#include <octave/config.h> -+#include <octave/f77-fcn.h> - int F77_FUNC (hello, HELLO) (const int &n); - EOF - ac_try="$MKOCTFILE -c conftest.cc" -diff -uNr a/src/configure.base b/src/configure.base ---- a/src/configure.base 2018-01-09 18:00:27.978452208 -0500 -+++ b/src/configure.base 2018-01-09 18:01:54.598752821 -0500 -@@ -135,7 +135,7 @@ - AC_DEFUN(TRY_MKOCTFILE, - [AC_MSG_CHECKING($1) - cat > conftest.cc << EOF --#include <octave/config.h> -+#include <octave/f77-fcn.h> - $2 - EOF - ac_try="$MKOCTFILE -c conftest.cc" -diff -uNr a/src/dbleGSVD.cc b/src/dbleGSVD.cc ---- a/src/dbleGSVD.cc 2015-01-24 14:54:11.000000000 -0500 -+++ b/src/dbleGSVD.cc 2018-01-09 18:01:43.855211637 -0500 -@@ -14,10 +14,6 @@ - // You should have received a copy of the GNU General Public License along with - // this program; if not, see <http://www.gnu.org/licenses/>. - --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -- - #include <iostream> - - #include "dbleGSVD.h" -diff -uNr a/src/gsvd.cc b/src/gsvd.cc ---- a/src/gsvd.cc 2015-01-24 14:54:11.000000000 -0500 -+++ b/src/gsvd.cc 2018-01-09 18:02:03.650366267 -0500 -@@ -14,10 +14,6 @@ - // You should have received a copy of the GNU General Public License along with - // this program; if not, see <http://www.gnu.org/licenses/>. - --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -- - #include "CmplxGSVD.h" - #include "dbleGSVD.h" -
--- a/src/of-linear-algebra-4-fixes.patch Thu Nov 14 08:06:48 2019 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -diff -uNr a/src/gsvd.cc b/src/gsvd.cc ---- a/src/gsvd.cc 2015-01-24 14:54:11.000000000 -0500 -+++ b/src/gsvd.cc 2018-04-09 14:25:44.604821251 -0400 -@@ -23,8 +23,8 @@ - - #include "defun-dld.h" - #include "error.h" --#include "gripes.h" --#include "oct-obj.h" -+#include "errwarn.h" -+#include "ovl.h" - #include "pr-output.h" - #include "utils.h" - -@@ -211,7 +211,7 @@ - ? GSVD::sigma_only - : (nargout > 5) ? GSVD::std : GSVD::economy ); - -- if (argA.is_real_type () && argB.is_real_type ()) -+ if (argA.isreal () && argB.isreal ()) - { - Matrix tmpA = argA.matrix_value (); - Matrix tmpB = argB.matrix_value (); -@@ -253,7 +253,7 @@ - } - } - } -- else if (argA.is_complex_type () || argB.is_complex_type ()) -+ else if (argA.iscomplex () || argB.iscomplex ()) - { - ComplexMatrix ctmpA = argA.complex_matrix_value (); - ComplexMatrix ctmpB = argB.complex_matrix_value (); -@@ -296,8 +296,8 @@ - } - else - { -- gripe_wrong_type_arg ("gsvd", argA); -- gripe_wrong_type_arg ("gsvd", argB); -+ err_wrong_type_arg ("gsvd", argA); -+ err_wrong_type_arg ("gsvd", argB); - return retval; - } - }
--- a/src/of-linear-algebra-5-deprecated.patch Thu Nov 14 08:06:48 2019 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -diff -r a9667cba7fd4 src/CmplxGSVD.cc ---- a/src/CmplxGSVD.cc Mon Jan 02 16:31:33 2017 -0500 -+++ b/src/CmplxGSVD.cc Sun Jan 20 20:15:09 2019 +0100 -@@ -215,9 +215,6 @@ - F77_CHAR_ARG_LEN (1) - F77_CHAR_ARG_LEN (1) - F77_CHAR_ARG_LEN (1))); -- -- if (f77_exception_encountered) -- (*current_liboctave_error_handler) ("unrecoverable error in zggsvd"); - - if (info < 0) { - (*current_liboctave_error_handler) ("zggsvd.f: argument %d illegal", -info); -diff -r a9667cba7fd4 src/dbleGSVD.cc ---- a/src/dbleGSVD.cc Mon Jan 02 16:31:33 2017 -0500 -+++ b/src/dbleGSVD.cc Sun Jan 20 20:15:09 2019 +0100 -@@ -210,10 +210,7 @@ - F77_CHAR_ARG_LEN (1) - F77_CHAR_ARG_LEN (1) - F77_CHAR_ARG_LEN (1))); -- -- if (f77_exception_encountered) -- (*current_liboctave_error_handler) ("unrecoverable error in dggsvd"); -- -+ - if (info < 0) { - (*current_liboctave_error_handler) ("dggsvd.f: argument %d illegal", -info); - } else { -diff -r a9667cba7fd4 src/pgmres.cc ---- a/src/pgmres.cc Mon Jan 02 16:31:33 2017 -0500 -+++ b/src/pgmres.cc Sun Jan 20 20:15:09 2019 +0100 -@@ -148,7 +148,7 @@ - prn = xnorm (res, 2.0); - B(0) = prn; - H = Matrix (1, 1, 0.0); -- V = Matrix (b.length (), 1, 0.0); -+ V = Matrix (b.numel (), 1, 0.0); - for (octave_idx_type ii = 0; ii < V.rows (); ii++) - V(ii,0) = res(ii) / prn; - } -@@ -206,7 +206,7 @@ - { - ColumnVector res; - octave_value_list retval; -- retval = feval (fun, octave_value(b), 1); -+ retval = octave::feval (fun, ovl (b), 1); - res = retval(0).column_vector_value (); - if ( error_state) - {
--- a/src/of-linear-algebra.mk Thu Nov 14 08:06:48 2019 -0500 +++ b/src/of-linear-algebra.mk Thu Nov 14 08:06:49 2019 -0500 @@ -3,11 +3,11 @@ PKG := of-linear-algebra $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.2 -$(PKG)_CHECKSUM := 5ebc229807038d5663540b6a6f1e00608dce4e7b +$(PKG)_VERSION := 2.2.3 +$(PKG)_CHECKSUM := eb458af318f96e8fa7eea71c2a13acb03e43dac2 $(PKG)_REMOTE_SUBDIR := -$(PKG)_SUBDIR := linear-algebra -$(PKG)_FILE := linear-algebra-$($(PKG)_VERSION).tar.gz +$(PKG)_SUBDIR := linear-algebra-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download' $(PKG)_DEPS :=