Terminal

Merge lp:~elementary-apps/pantheon-terminal/fix-cmake-cppflags into lp:~elementary-apps/pantheon-terminal/trunk

  1. fix-cmake-cppflags
  2. Merge into trunk
Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Merged at revision: 586
Proposed branch: lp:~elementary-apps/pantheon-terminal/fix-cmake-cppflags
Merge into: lp:~elementary-apps/pantheon-terminal/trunk
Diff against target: 14 lines (+5/-0)
1 file modified
CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-terminal/fix-cmake-cppflags
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Review via email: mp+227553@code.launchpad.net

This proposal supersedes a proposal from 2014-06-03.

Commit message

CMake: add contents of CPPFLAGS to CMake's flags

Fixes hardening options not being passed.

Description of the change

Honor CPPFLAGS env variable in CMake to fix bug #1325329

For more info see:
http://www.cmake.org/Bug/view.php?id=12928
https://wiki.debian.org/Hardening

To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
David Gomes (davidgomes) wrote : Posted in a previous version of this proposal

13:55:39 <ricotz> Munchor, hmm, http://www.cmake.org/pipermail/cmake/2009-April/028853.html

And put that newline in INSTALL back.

review: Needs Fixing
Revision history for this message
Rico Tzschichholz (ricotz) wrote : Posted in a previous version of this proposal

http://www.cmake.org/Bug/view.php?id=12928

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote : Posted in a previous version of this proposal

David: I've *added* the newline instead of removing it ;)

Rico: So what should I do? Apply this patch? Hack around in packaging? Or something else?

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote : Posted in a previous version of this proposal

Apparently Maya is unaffected by this issue, but its source tree does not seem to contain "CPPFLAGS" string.

lp:~elementary-apps/pantheon-terminal/fix-cmake-cppflags updated
586. By Sergey "Shnatsel" Davidoff

CMake: add contents of CPPFLAGS to CMake's flags, fixes hardening options not being passed (bug #1325329)

Revision history for this message
Rico Tzschichholz (ricotz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-07-07 23:20:47 +0000
3+++ CMakeLists.txt 2014-07-21 13:45:41 +0000
4@@ -48,6 +48,11 @@
5
6 add_definitions (${DEPS_CFLAGS})
7
8+# Work around http://www.cmake.org/Bug/view.php?id=12928:
9+# CMake ignores CPPFLAGS where Debian and Ubuntu pass their hardening options.
10+# See the bug linked above and https://wiki.debian.org/Hardening for more info.
11+add_definitions (${CPPFLAGS})
12+
13 link_libraries (${DEPS_LIBRARIES})
14 link_directories (${DEPS_LIBRARY_DIRS})
15

Subscribers

People subscribed via source and target branches