[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
Bas Couwenberg
sebastic at xs4all.nl
Tue Oct 8 22:34:35 UTC 2013
The following commit has been merged in the master branch:
commit 806a065dfbef9c1db5b83639853e7868761626e5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Oct 5 21:46:44 2013 +0200
Update ld-as-needed.diff to fix FTBFS with --as-needed.
diff --git a/debian/changelog b/debian/changelog
index de48a97..2eb2dd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libkml (1.3.0~r863-5) UNRELEASED; urgency=low
* Add myself to Uploaders.
* Update swig.diff to also disable the SWIG version check in configure.ac.
Thanks Ilya Barygin for the patch.
+ * Update ld-as-needed.diff to fix FTBFS with --as-needed.
+ Thanks Ilya Barygin for the patch.
+ (closes: #692055)
-- Bas Couwenberg <sebastic at xs4all.nl> Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/patches/ld-as-needed.diff b/debian/patches/ld-as-needed.diff
index df065d2..ffd06ee 100644
--- a/debian/patches/ld-as-needed.diff
+++ b/debian/patches/ld-as-needed.diff
@@ -1,7 +1,5 @@
-Index: git/examples/helloworld/Makefile.am
-===================================================================
---- git.orig/examples/helloworld/Makefile.am 2011-03-29 14:49:48.000000000 +0200
-+++ git/examples/helloworld/Makefile.am 2011-03-29 14:49:48.000000000 +0200
+--- a/examples/helloworld/Makefile.am
++++ b/examples/helloworld/Makefile.am
@@ -26,8 +26,8 @@
circlegen_LDADD = \
$(top_builddir)/src/kml/base/libkmlbase.la \
@@ -33,10 +31,22 @@ Index: git/examples/helloworld/Makefile.am
$(top_builddir)/src/kml/base/libkmlbase.la
printgeometry_SOURCES = printgeometry.cc
-Index: git/examples/regionator/Makefile.in
-===================================================================
---- git.orig/examples/regionator/Makefile.in 2011-03-29 14:49:48.000000000 +0200
-+++ git/examples/regionator/Makefile.in 2011-03-29 14:49:48.000000000 +0200
+--- a/examples/regionator/Makefile.in
++++ b/examples/regionator/Makefile.in
+@@ -52,11 +52,11 @@
+ am_csvregionator_OBJECTS = csvregionator.$(OBJEXT)
+ csvregionator_OBJECTS = $(am_csvregionator_OBJECTS)
+ csvregionator_DEPENDENCIES = \
++ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+- $(top_builddir)/src/kml/regionator/libkmlregionator.la \
+- $(top_builddir)/src/kml/convenience/libkmlconvenience.la
++ $(top_builddir)/src/kml/regionator/libkmlregionator.la
+ am_kmlregionator_OBJECTS = kmlregionator.$(OBJEXT)
+ kmlregionator_OBJECTS = $(am_kmlregionator_OBJECTS)
+ kmlregionator_DEPENDENCIES = \
@@ -232,9 +232,9 @@
kmlregionator_LDADD = \
$(top_builddir)/src/kml/base/libkmlbase.la \
@@ -49,11 +59,21 @@ Index: git/examples/regionator/Makefile.in
all: all-am
-Index: git/examples/regionator/Makefile.am
-===================================================================
---- git.orig/examples/regionator/Makefile.am 2011-03-29 14:49:48.000000000 +0200
-+++ git/examples/regionator/Makefile.am 2011-03-29 14:49:48.000000000 +0200
-@@ -20,7 +20,7 @@
+--- a/examples/regionator/Makefile.am
++++ b/examples/regionator/Makefile.am
+@@ -10,17 +10,17 @@
+
+ csvregionator_SOURCES = csvregionator.cc
+ csvregionator_LDADD = \
++ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
+ $(top_builddir)/src/kml/base/libkmlbase.la \
+ $(top_builddir)/src/kml/dom/libkmldom.la \
+ $(top_builddir)/src/kml/engine/libkmlengine.la \
+- $(top_builddir)/src/kml/regionator/libkmlregionator.la \
+- $(top_builddir)/src/kml/convenience/libkmlconvenience.la
++ $(top_builddir)/src/kml/regionator/libkmlregionator.la
+
+ kmlregionator_SOURCES = kmlregionator.cc
kmlregionator_LDADD = \
$(top_builddir)/src/kml/base/libkmlbase.la \
$(top_builddir)/src/kml/dom/libkmldom.la \
@@ -63,10 +83,8 @@ Index: git/examples/regionator/Makefile.am
+ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
+ $(top_builddir)/src/kml/engine/libkmlengine.la
-Index: git/examples/helloworld/Makefile.in
-===================================================================
---- git.orig/examples/helloworld/Makefile.in 2011-03-29 14:49:48.000000000 +0200
-+++ git/examples/helloworld/Makefile.in 2011-03-29 14:49:48.000000000 +0200
+--- a/examples/helloworld/Makefile.in
++++ b/examples/helloworld/Makefile.in
@@ -345,8 +345,8 @@
circlegen_LDADD = \
$(top_builddir)/src/kml/base/libkmlbase.la \
--
A library to manipulate KML 2.2 OGC standard files
More information about the Pkg-grass-devel
mailing list