view src/libodbc++-1-win32.patch @ 5531:eae508c12529

Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents 99516e73b368
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

--- libodbc++-0.2.5.orig/configure.ac	2009-08-20 23:39:08.000000000 +0200
+++ libodbc++-0.2.5/configure.ac	2010-02-04 22:40:32.000000000 +0100
@@ -118,7 +118,7 @@
 if test "x$iodbc_ok" != "xyes" &&
    test "x$odbc_ok" != "xyes" 
 then
-	AC_MSG_ERROR([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?])
+	AC_MSG_WARN([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?])
 fi
 
 AC_ARG_WITH(odbc-version,
--- libodbc++-0.2.5.orig/src/datastream.h	2009-01-06 12:20:05.000000000 +0100
+++ libodbc++-0.2.5/src/datastream.h	2009-10-27 23:14:22.000000000 +0100
@@ -35,7 +35,7 @@
 #if defined(ODBCXX_QT)
 # include <qiodevice.h>
 #endif
-
+#include <stdio.h>
 namespace odbc {
 
 #if !defined(ODBCXX_QT)
--- libodbc++-0.2.5.orig/include/odbc++/resultset.h	2009-03-07 07:41:09.000000000 +0100
+++ libodbc++-0.2.5/include/odbc++/resultset.h	2009-10-27 23:07:54.000000000 +0100
@@ -474,7 +474,7 @@
      * @param idx The column index, starting at 1
      * @param val The value to set
      */
-	Guid ResultSet::getGuid(int idx);
+	Guid getGuid(int idx);
 #endif
     /** Sets the value of a column to an int
      * @param idx The column index, starting at 1