[yade] 02/06: Remove patch, applied by upstream.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jan 13 19:14:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit a421b10ffc69adf191569f541e3d50c124c13ab4
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jan 13 19:57:19 2014 +0100
Remove patch, applied by upstream.
---
debian/patches/20_disable_release-mode.patch | 40 ----------------------------
debian/patches/series | 1 -
2 files changed, 41 deletions(-)
diff --git a/debian/patches/20_disable_release-mode.patch b/debian/patches/20_disable_release-mode.patch
deleted file mode 100644
index 67d8b8f..0000000
--- a/debian/patches/20_disable_release-mode.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: disable release-mode in cmake.
- Pass also -ftrack-macro-expansion=0 option to
- reduce RAM-consumption.
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56746
- https://lists.debian.org/debian-devel/2013/10/msg00219.html
-Author: Anton Gladky <gladk at debian.org>
-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701231#12
-Bug-Debian: http://bugs.debian.org/726009
-Last-Update: 2013-10-30
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,19 @@
- INCLUDE(FindPythonModule)
- INCLUDE(GNUInstallDirs)
- #===========================================================
-+# HACK!!! If the version of gcc is 4.8 or greater, we add -ftrack-macro-expansion=0
-+# to compiler to reduce the memory consumption during compilation step.
-+# See http://bugs.debian.org/726009 for more information
-+# Can be removed later, if gcc fixes its regression
-+# Taken from http://stackoverflow.com/questions/4058565/check-gcc-minor-in-cmake
-+
-+EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-+IF (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-+ MESSAGE(STATUS "GCC Version >= 4.8. Adding -ftrack-macro-expansion=0")
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrack-macro-expansion=0 ")
-+ENDIF()
-+
-+#===========================================================
- IF (CMAKE_CXX_FLAGS)
- #If flags are set, add only neccessary flags
- IF (DEBUG)
-@@ -46,7 +59,6 @@
- SET(CMAKE_BUILD_TYPE Debug)
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DYADE_PTR_CAST=static_pointer_cast -DYADE_CAST=static_cast -DYADE_DEBUG")
- ELSE (DEBUG)
-- SET(CMAKE_BUILD_TYPE Release)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DYADE_PTR_CAST=static_pointer_cast -DYADE_CAST=static_cast -fPIC")
- ENDIF (DEBUG)
- ELSE (CMAKE_CXX_FLAGS)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5006287..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-20_disable_release-mode.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git
More information about the debian-science-commits
mailing list