diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
| commit | 17dddeeee560527a8f30d37761949d658056cb09 (patch) | |
| tree | 15b0b19c55787f556eb9b42c28d173bddc5435db /gnu/packages/patches/lib2geom-enable-assertions.patch | |
| parent | 331a09654eb7e9f6212b7e8469077fa7393e8b11 (diff) | |
| parent | 6a9581741e4ee81226aeb2f1c997df76670a6aab (diff) | |
| download | guix-17dddeeee560527a8f30d37761949d658056cb09.tar.gz guix-17dddeeee560527a8f30d37761949d658056cb09.zip | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/patches/lib2geom-enable-assertions.patch')
| -rw-r--r-- | gnu/packages/patches/lib2geom-enable-assertions.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/lib2geom-enable-assertions.patch b/gnu/packages/patches/lib2geom-enable-assertions.patch deleted file mode 100644 index 8feb44acbf..0000000000 --- a/gnu/packages/patches/lib2geom-enable-assertions.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4aa78f52232682b353eb15c219171e466987bac7 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer <maxim.cournoyer@gmail.com> -Date: Thu, 16 Jan 2020 00:19:29 -0500 -Subject: [PATCH] build: Enable assertions for the RelWithDebugInfo build type. - -This fixes issue #5 (see: -https://gitlab.com/inkscape/lib2geom/issues/5). - -* CMakeLists.txt: Remove the "-DNDEBUG" CXX flag from the default -configuration for the RelWithDebugInfo build type. ---- - CMakeLists.txt | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bfeb8f03..a663a1b0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,6 +19,14 @@ enable_testing() - - include(CheckCXXSourceCompiles) - -+# Enable assertions for the RelWithDebugInfo build type. This is -+# useful as some tests make use of it (see: -+# https://gitlab.com/inkscape/lib2geom/issues/5). -+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") -+ string(REPLACE "-DNDEBUG" "" -+ CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") -+endif() -+ - # Find dependencies - find_package(Boost 1.40 REQUIRED) - find_package(DoubleConversion REQUIRED) --- -2.24.1 - |