[pocl] 04/07: do not set -fno-rtti under cmake

[Andreas Beckmann]

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

anbe pushed a commit to branch experimental
in repository pocl.

commit e2b6dfa52842b9dd8cea1842292c88e97ae13183
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Nov 26 21:41:49 2017 +0100

    do not set -fno-rtti under cmake
---
 debian/changelog                       |  2 ++
 debian/patches/cmake-no-fno-rtti.patch | 20 ++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 06703d8..e42fc65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pocl (0.13-12) UNRELEASED; urgency=medium
 
   * Switch to cmake build system.
   * llvmopencl.so.7 is now a private library.  (Closes: #823528)
+  * cmake-no-fno-rtti.patch: Build without -fno-rtti (a workaround for
+    clang-3.7), like autotools, to avoid symbol changes.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 26 Nov 2017 21:37:57 +0100
 
diff --git a/debian/patches/cmake-no-fno-rtti.patch b/debian/patches/cmake-no-fno-rtti.patch
new file mode 100644
index 0000000..e9667ad
--- /dev/null
+++ b/debian/patches/cmake-no-fno-rtti.patch
@@ -0,0 +1,20 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: do not set -fno-rtti under CMake
+ to make the build better mimic the autotools build and to
+ not generate symbol differences
+
+--- a/cmake/LLVM.cmake
++++ b/cmake/LLVM.cmake
+@@ -176,9 +176,9 @@ string(REPLACE " -pedantic" "" LLVM_CXXF
+ # - '-fno-rtti' is a work-around for llvm bug 14200
+ # Which according to bug report has been fixed in llvm 3.7
+ # sadly, that bugreport is mistaken, it's not fixed in 3.7
+-if (NOT MSVC)
+-  set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-rtti")
+-endif()
++#if (NOT MSVC)
++#  set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-rtti")
++#endif()
+ 
+ 
+ # Llvm-config may be installed or it might be used from build directory, in which case
diff --git a/debian/patches/series b/debian/patches/series
index be411ec..18e430c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ set-POCL_DEVICE_ADDRESS_BITS-before-use.patch
 consistent-newlines-in-POCL_ABORT.patch
 do-not-export-clang-symbols.patch
 libstdc++-7-dev.patch
+cmake-no-fno-rtti.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git