Mercurial > mxe-octave

changeset 4593:705d0432dbf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-linear-algebra: don't use config.h
author John W. Eaton <jwe@octave.org>
date Tue, 09 Jan 2018 18:04:44 -0500
parents cfce5c9ba320
children 43de7d9113e7
files dist-files.mk src/of-linear-algebra-3-fixes.patch
diffstat 2 files changed, 67 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Jan 09 17:51:11 2018 -0500
+++ b/dist-files.mk	Tue Jan 09 18:04:44 2018 -0500
@@ -479,6 +479,7 @@
   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.mk \
   of-lssa.mk \
   of-ltfat-1-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-linear-algebra-3-fixes.patch	Tue Jan 09 18:04:44 2018 -0500
@@ -0,0 +1,66 @@
+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"
+