summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2014-04-02 16:04:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 11:53:51 +0100
commit85783e56e46e1c9724c5284c8de8c1a995723659 (patch)
tree4314c7a473a666663c774add94fd4406a01a2f11
parent84aeaa4d562fff13368af653ee09ecb93d11372a (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb5
-rw-r--r--meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch17
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb
index 08b2c02641..d032cb97e0 100644
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb
@@ -4,7 +4,10 @@ inherit native
4# Using cmake's internal libarchive, so some dependencies are needed 4# Using cmake's internal libarchive, so some dependencies are needed
5DEPENDS += "bzip2-native zlib-native" 5DEPENDS += "bzip2-native zlib-native"
6 6
7SRC_URI += "file://cmlibarchive-disable-ext2fs.patch" 7SRC_URI += "\
8 file://cmlibarchive-disable-ext2fs.patch \
9 file://disable-bootstrap-cursesdialog.patch \
10"
8 11
9SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66" 12SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66"
10SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e" 13SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e"
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 @@
1Disable building CursesDialog so that cmake-native doesn't have to
2depend on ncurses-native.
3
4Upstream-status: Inappropriate [disable feature]
5
6Signed-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