[kido] 04/04: Patch code to respect cflags

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch master
in repository kido.

commit 444c036b4a0b3e44a3da218ed5187126784bfbad
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 1 12:02:12 2016 +0000

    Patch code to respect cflags
---
 debian/patches/0001-respect-cflags.patch | 13 +++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0001-respect-cflags.patch b/debian/patches/0001-respect-cflags.patch
new file mode 100644
index 0000000..c6c92e0
--- /dev/null
+++ b/debian/patches/0001-respect-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36526d3..6e6a322 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -503,7 +503,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
+   endif()
+   set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+   set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-omit-frame-pointer -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}")
++  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+   set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_DEBUG} -pg")
+ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   set(CMAKE_CXX_FLAGS "-msse2 -fPIC")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..83f81be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-respect-cflags.patch
diff --git a/debian/rules b/debian/rules
index 1646609..7d609be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,9 @@ export DH_VERBOSE=1
 
 CMAKE_FLAGS = \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
-        -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
-        -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
+        -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(CFLAGS)" \
+        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(CXXFLAGS)" \
+        -DCMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO="$(LDFLAGS)" \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_SKIP_INSTALL_RPATH=TRUE
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/kido.git