[SCM] saga branch, master, updated. 49bcf7514b30a718d798c16dda4f66b1ba751902

Johan Van de Wauw johan.vandewauw at gmail.com
Thu Jun 23 22:53:39 UTC 2011


The following commit has been merged in the master branch:
commit 49bcf7514b30a718d798c16dda4f66b1ba751902
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Jun 23 18:53:06 2011 -0400

    Fix for building with gcc 4.6

diff --git a/debian/patches/0007-Fix-for-gcc-4.6.patch b/debian/patches/0007-Fix-for-gcc-4.6.patch
new file mode 100644
index 0000000..2988425
--- /dev/null
+++ b/debian/patches/0007-Fix-for-gcc-4.6.patch
@@ -0,0 +1,37 @@
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Thu, 23 Jun 2011 18:51:07 -0400
+Subject: Fix for gcc 4.6
+
+(a bit dirty: passing -fpermissive to the compiler)
+---
+ src/modules_io/db/io_odbc/Makefile.am |    2 +-
+ src/modules_io/db/io_odbc/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules_io/db/io_odbc/Makefile.am b/src/modules_io/db/io_odbc/Makefile.am
+index 58103fc..0a2ebc2 100644
+--- a/src/modules_io/db/io_odbc/Makefile.am
++++ b/src/modules_io/db/io_odbc/Makefile.am
+@@ -9,7 +9,7 @@ DEP_DEFS = -D_SAGA_UNICODE
+ endif
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ CXX_INCS           = -I$(top_srcdir)/src/saga_core
+-AM_CXXFLAGS        = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS)
++AM_CXXFLAGS        = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) -fpermissive
+ AM_LDFLAGS         = $(DEP_LFLG) $(DEP_LIBS) -avoid-version
+ pkglib_LTLIBRARIES = libio_odbc.la
+ libio_odbc_la_SOURCES =\
+diff --git a/src/modules_io/db/io_odbc/Makefile.in b/src/modules_io/db/io_odbc/Makefile.in
+index 679bf54..452e91d 100644
+--- a/src/modules_io/db/io_odbc/Makefile.in
++++ b/src/modules_io/db/io_odbc/Makefile.in
+@@ -252,7 +252,7 @@ top_srcdir = @top_srcdir@
+ @SAGA_UNICODE_TRUE at DEP_DEFS = -D_SAGA_UNICODE
+ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ CXX_INCS = -I$(top_srcdir)/src/saga_core
+-AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS)
++AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) -fpermissive
+ AM_LDFLAGS = $(DEP_LFLG) $(DEP_LIBS) -avoid-version
+ pkglib_LTLIBRARIES = libio_odbc.la
+ libio_odbc_la_SOURCES = \
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 59e42ba..afb96ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Run-autoreconf-fi.patch
 0005-Fix-GCC-build-issue.patch
 0006-Use-debian-version-of-grib2.patch
+0007-Fix-for-gcc-4.6.patch

-- 
Saga GIS



More information about the Pkg-grass-devel mailing list