[ignition-math2] 03/03: Remove obsolete patch

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Mon Feb 22 17:24:35 UTC 2016


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

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

commit c6bc9aba2c8636b060923eef36d61241f09e4294
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Feb 22 17:24:04 2016 +0000

    Remove obsolete patch
---
 debian/patches/0001-c++11-unconditional.patch | 36 ---------------------------
 debian/patches/series                         |  1 -
 2 files changed, 37 deletions(-)

diff --git a/debian/patches/0001-c++11-unconditional.patch b/debian/patches/0001-c++11-unconditional.patch
deleted file mode 100644
index 4f4542f..0000000
--- a/debian/patches/0001-c++11-unconditional.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Declare c++11 flag unconditional
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: No
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ce5d4cb..e740563 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -175,11 +175,13 @@ else()
-   set(WARN_LEVEL "-Wall")
- endif()
- 
-+set (UNFILTERED_FLAGS -std=c++11)
-+
- filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long
-   -Wno-unused-value -Wno-unused-value -Wno-unused-value -Wno-unused-value
-   -Wfloat-equal -Wshadow -Winit-self -Wswitch-default
-   -Wmissing-include-dirs -pedantic)
--set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WARNING_CXX_FLAGS}")
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WARNING_CXX_FLAGS} ${UNFILTERED_FLAGS}")
- 
- #################################################
- # OS Specific initialization
-diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake
-index 247a56a..a2717c8 100644
---- a/cmake/DefaultCFlags.cmake
-+++ b/cmake/DefaultCFlags.cmake
-@@ -30,7 +30,7 @@ set (CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_C_FLAGS_COVERAGE} -fno-elide-constructors
- # Set all the global build flags
- if (UNIX)
-   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
--  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}} -std=c++11")
-+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-   set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-   set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
diff --git a/debian/patches/series b/debian/patches/series
index c937450..3330145 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-c++11-unconditional.patch
 0002_use_system_gtest.patch
 0003_fix_collinear_boundary.patch

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



More information about the debian-science-commits mailing list