Commit 60290477 authored by Graham Inggs's avatar Graham Inggs

Drop googletest-gcc6 patch as well

parent bcffb57d
......@@ -8,7 +8,7 @@ yaml-cpp (0.6.2-1) UNRELEASED; urgency=medium
* Fix watch file
[ Graham Inggs ]
* Drop backport-b426fafff.patch, no longer needed
* Drop patches no longer needed
* Drop dependencies on libboost-dev, no longer needed
-- Andreas Tille <tille@debian.org> Tue, 19 Jun 2018 14:12:09 +0200
......
From: Christian Hofstaedtler <zeha@debian.org>
Date: Thu, 30 Jun 2016 22:05:02 +0000
Subject: Workaround bug in googletest, fixing bug #812284
---
test/CMakeLists.txt | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,6 +23,19 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" O
endif()
endif()
+# In some cases gTest segfaults with GCC >= 6.0.0. This is a dirty fix.
+# TODO: Update to gTest-release with proper support for GCC >= 6.0.0.
+# See: https://github.com/google/googletest/issues/705
+IF(CMAKE_COMPILER_IS_GNUCXX)
+ # in order to support cmake 2.8.7 and older
+ IF(NOT CMAKE_CXX_COMPILER_VERSION)
+ include(CheckCompiler)
+ ENDIF(NOT CMAKE_CXX_COMPILER_VERSION)
+ IF(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "6.0.0")
+ set(yaml_test_flags "${yaml_test_flags} -fno-delete-null-pointer-checks")
+ ENDIF(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "6.0.0")
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
file(GLOB test_headers [a-z_]*.h)
file(GLOB test_sources [a-z_]*.cpp integration/[a-z_]*.cpp node/[a-z_]*.cpp)
file(GLOB test_new_api_sources new-api/[a-z]*.cpp)
install-cmake-dev-files.patch
reproducible-build.patch
0003-Workaround-bug-in-googletest-fixing-bug-812284.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment