diff options
author | Mike Crowe <mac@mcrowe.com> | 2014-04-08 14:51:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-08 17:45:08 +0100 |
commit | c0ac09ab49d7a2b9cc7601ceef2852d690cdf3d1 (patch) | |
tree | b5b37d65516e76d8ee60f3442cd3d6c7db43dbfa /meta/recipes-devtools/cmake/cmake | |
parent | 68a55c8ff779d8df90626e68d5d4e48660dd8027 (diff) | |
download | poky-c0ac09ab49d7a2b9cc7601ceef2852d690cdf3d1.tar.gz |
cmake: Improve method for not building ccmake
In commit 4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51 I introduced an
unnecessary patch to do something that can easily be done without
patching.
The argument to disable building ccmake can be passed to configure provided
it is preceded by "--".
(From OE-Core rev: eaf176eaabb4c558ad76512b30b28ec97fd90bc6)
Signed-off-by: Mike Crowe <mac@mcrowe.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, 0 insertions, 17 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch b/meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch deleted file mode 100644 index 9d378fb24c..0000000000 --- a/meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
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 | ||