diff options
author | Mike Crowe <mac@mcrowe.com> | 2014-04-02 16:04:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 11:53:51 +0100 |
commit | 85783e56e46e1c9724c5284c8de8c1a995723659 (patch) | |
tree | 4314c7a473a666663c774add94fd4406a01a2f11 /meta/recipes-devtools/cmake/cmake | |
parent | 84aeaa4d562fff13368af653ee09ecb93d11372a (diff) | |
download | poky-85783e56e46e1c9724c5284c8de8c1a995723659.tar.gz |
cmake-native: Stop building ccmake
The bootstrapped cmake is called in such a way that it will automatically
enable building ccmake if curses is found. This tool isn't particularly
useful to us and it will cause build problems if ncurses-native is built in
parallel with cmake-native so let's just pass -DBUILD_CursesDialog=0 to
disable the feature altogether as the non-native cmake does.
Unfortunately this requires patching the bootstrap script since there
appears to be no way to get this option through.
(From OE-Core rev: 4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch b/meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch new file mode 100644 index 0000000000..9d378fb24c --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Disable building CursesDialog so that cmake-native doesn't have to | ||
2 | depend on ncurses-native. | ||
3 | |||
4 | Upstream-status: Inappropriate [disable feature] | ||
5 | |||
6 | Signed-off-by: Mike Crowe <mac@mcrowe.com> | ||
7 | |||
8 | --- cmake-2.8.12.2/bootstrap~ 2014-01-16 17:15:09.000000000 +0000 | ||
9 | +++ cmake-2.8.12.2/bootstrap 2014-04-01 21:27:23.841996822 +0100 | ||
10 | @@ -1578,6 +1578,7 @@ export MAKE | ||
11 | |||
12 | # Run bootstrap CMake to configure real CMake | ||
13 | cmake_options="-DCMAKE_BOOTSTRAP=1" | ||
14 | +cmake_options="${cmake_options} -DBUILD_CursesDialog=0" | ||
15 | if [ -n "${cmake_verbose}" ]; then | ||
16 | cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1" | ||
17 | fi | ||