Drop support_cppflags.diff patch.

This particular solution was rejected by upstream.
Reopens #653916.
ci/unstable
Modestas Vainius 13 years ago
parent 8c098f5507
commit 74bc2b76d2

2
debian/changelog vendored

@ -3,6 +3,8 @@ cmake (2.8.7-3) UNRELEASED; urgency=low
* Fix some tests not to fail if absolute build path contains regex
metacharacters like +. This makes the package binNMUable again.
(patch paths_in_regex_espace_metachars.diff)
* Drop support_cppflags.diff patch because this particular solution was
rejected by upstream. This reopens #653916.
-- Modestas Vainius <modax@debian.org> Sun, 26 Feb 2012 23:22:41 +0200

@ -1,6 +1,5 @@
FindBoost_add_-lpthread_#563479.diff
multiarch_findgtk2_fix.diff
support_cppflags.diff
manpage_fixes.diff
mipsel_is_little_endian.diff
paths_in_regex_espace_metachars.diff

@ -1,32 +0,0 @@
From: Modestas Vainius <modax@debian.org>
Subject: Support CPPFLAGS environment variable
Bug: http://www.cmake.org/Bug/view.php?id=12928
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653916
Forwarded: no
Last-Update: 2012-02-18
For now, append CPPFLAGS to CFLAGS and CXXFLAGS. In the perfect world, whenever
C/C++ preprocessor is invoked, CPPFLAGS should be passed to it.
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -102,7 +102,7 @@ IF(NOT CMAKE_MODULE_EXISTS)
SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
ENDIF(NOT CMAKE_MODULE_EXISTS)
-SET(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
+SET(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} $ENV{CPPFLAGS} ${CMAKE_C_FLAGS_INIT}")
# avoid just having a space as the initial value for the cache
IF(CMAKE_C_FLAGS_INIT STREQUAL " ")
SET(CMAKE_C_FLAGS_INIT)
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -183,7 +183,7 @@ ENDFOREACH(type)
# on the initial values computed in the platform/*.cmake files
# use _INIT variables so that this only happens the first time
# and you can set these flags in the cmake cache
-SET(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
+SET(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} $ENV{CPPFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
# avoid just having a space as the initial value for the cache
IF(CMAKE_CXX_FLAGS_INIT STREQUAL " ")
SET(CMAKE_CXX_FLAGS_INIT)
Loading…
Cancel
Save