[libkml] 09/23: Add patch to fix FTBFS due to ; separated compiler flags.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libkml.

commit d0e8be60a28d81b4ba2b6d1e6d902ade0fa7d0c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 25 16:37:30 2015 +0200

    Add patch to fix FTBFS due to ; separated compiler flags.
---
 debian/changelog                    |  1 +
 debian/patches/compiler-flags.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8a10f7b..c957f83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libkml (1.3.0~r864+git20150723-0fa2f22-1) UNRELEASED; urgency=medium
     third party sources no longer included.
   * Switch build system from autotools to cmake.
   * Drop automake related patches, refresh remaining patch.
+  * Add patch to fix FTBFS due to ; separated compiler flags.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 25 Jul 2015 15:16:12 +0200
 
diff --git a/debian/patches/compiler-flags.patch b/debian/patches/compiler-flags.patch
new file mode 100644
index 0000000..d4678cc
--- /dev/null
+++ b/debian/patches/compiler-flags.patch
@@ -0,0 +1,26 @@
+Description: Don't quote compiler flags to avoid insertion of ; character.
+ Fixes build failure:
+ .
+ make[3]: Entering directory '/tmp/buildd/libkml-1.3.0~r864+git20150723-0fa2f22/obj-x86_64-linux-gnu'
+ /usr/bin/cmake -E cmake_progress_report "/tmp/buildd/libkml-1.3.0~r864+git20150723-0fa2f22/obj-x86_64-linux-gnu/CMakeFiles" 
+ [  0%] Building CXX object src/kml/base/CMakeFiles/kmlbase.dir/time_util.cc.o
+ cd "/tmp/buildd/libkml-1.3.0~r864+git20150723-0fa2f22/obj-x86_64-linux-gnu/src/kml/base" && /usr/bin/c++   -Dkmlbase_EXPORTS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 ;-Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti -fPIC -I/usr/include/minizip -I/usr/include/uriparser -I"/tmp/buildd/libkml-1.3.0~r864+git20150723-0fa2f22/src"    -o CMakeFiles/kmlbase.dir/time_util.cc.o -c "/tmp/buildd/libkml-1.3.0~r864+git20150723-0fa2f22/src/kml/base/t [...]
+ c++: fatal error: no input files
+ compilation terminated.
+ /bin/sh: 1: -Wall: not found
+ src/kml/base/CMakeFiles/kmlbase.dir/build.make:57: recipe for target 'src/kml/base/CMakeFiles/kmlbase.dir/time_util.cc.o' failed
+ make[3]: *** [src/kml/base/CMakeFiles/kmlbase.dir/time_util.cc.o] Error 127
+ .
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ set(LIBKML_DATA_DIR  ${CMAKE_SOURCE_DIR}
+ #AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti
+ #AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti")
+ set(TEST_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0")
+ endif()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1da88f6..d831b2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 java-run-sh-shebang.diff
+compiler-flags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git