[SCM] spatialite branch, master, updated. upstream/2.4.0_rc4-34-gfa56bae

David Paleino dapal at debian.org
Sat Oct 8 16:21:43 UTC 2011


The following commit has been merged in the master branch:
commit 05963dbb5edfe05fb608ed554cdf5c4e065625d8
Author: David Paleino <dapal at debian.org>
Date:   Sat Oct 8 18:16:51 2011 +0200

    Fix linkage issues

diff --git a/debian/patches/01-add_missing_linkage.patch b/debian/patches/01-add_missing_linkage.patch
new file mode 100644
index 0000000..2b97b9e
--- /dev/null
+++ b/debian/patches/01-add_missing_linkage.patch
@@ -0,0 +1,54 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix linkage issues
+Origin: vendor
+Forwarded: not-needed
+
+---
+ spatialite-tools/Makefile.am |    6 ++++--
+ spatialite-tools/Makefile.in |    6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+--- spatialite.orig/spatialite-tools/Makefile.am
++++ spatialite/spatialite-tools/Makefile.am
+@@ -1,7 +1,8 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \
+-	-D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@
++	-D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \
++	-L../libspatialite/src/.libs/
+ 
+ bin_PROGRAMS = spatialite \
+ 	spatialite_tool \
+@@ -32,7 +33,8 @@ spatialite_osm_raw_LDADD = @LIBSPATIALIT
+ spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \
+ 	-lexpat 
+ spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
+-	@READLINE_LIBS@
++	@READLINE_LIBS@ \
++	-lfreexl
+ LDADD = @LIBSPATIALITE_LIBS@ 
+ 
+ EXTRA_DIST = makefile.vc nmake.opt \
+--- spatialite.orig/spatialite-tools/Makefile.in
++++ spatialite/spatialite-tools/Makefile.in
+@@ -252,7 +252,8 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \
+-	-D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@
++	-D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \
++	-L../libspatialite/src/.libs/
+ 
+ INCLUDES = @CFLAGS@
+ spatialite_SOURCES = shell.c shapefiles.c
+@@ -274,7 +275,8 @@ spatialite_gml_LDADD = @LIBSPATIALITE_LI
+ 	-lexpat 
+ 
+ spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
+-	@READLINE_LIBS@
++	@READLINE_LIBS@ \
++	-lfreexl
+ 
+ LDADD = @LIBSPATIALITE_LIBS@ 
+ EXTRA_DIST = makefile.vc nmake.opt \
diff --git a/debian/patches/series b/debian/patches/series
index 418768d..225aa1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 #00-add_automake_foreign.patch
+01-add_missing_linkage.patch

-- 
geospatial extension for SQLite



More information about the Pkg-grass-devel mailing list