Patchwork [1/2] cmake-native: Stop building ccmake

login
register
mail settings
Submitter Mike Crowe
Date April 2, 2014, 4:04 p.m.
Message ID <1396454652-15016-1-git-send-email-mac@mcrowe.com>
Download mbox | patch
Permalink /patch/70029/
State Accepted
Commit 85783e56e46e1c9724c5284c8de8c1a995723659
Headers show

Comments

Mike Crowe - April 2, 2014, 4:04 p.m.
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.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
 meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb    |  5 ++++-
 .../cmake/cmake/disable-bootstrap-cursesdialog.patch    | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch

Patch

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 08b2c02..d032cb9 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
 # Using cmake's internal libarchive, so some dependencies are needed
 DEPENDS += "bzip2-native zlib-native"
 
-SRC_URI += "file://cmlibarchive-disable-ext2fs.patch"
+SRC_URI += "\
+    file://cmlibarchive-disable-ext2fs.patch \
+    file://disable-bootstrap-cursesdialog.patch \
+"
 
 SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66"
 SRC_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 0000000..9d378fb
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch
@@ -0,0 +1,17 @@ 
+Disable building CursesDialog so that cmake-native doesn't have to
+depend on ncurses-native.
+
+Upstream-status: Inappropriate [disable feature]
+
+Signed-off-by: Mike Crowe <mac@mcrowe.com>
+
+--- cmake-2.8.12.2/bootstrap~	2014-01-16 17:15:09.000000000 +0000
++++ cmake-2.8.12.2/bootstrap	2014-04-01 21:27:23.841996822 +0100
+@@ -1578,6 +1578,7 @@ export MAKE
+ 
+ # Run bootstrap CMake to configure real CMake
+ cmake_options="-DCMAKE_BOOTSTRAP=1"
++cmake_options="${cmake_options} -DBUILD_CursesDialog=0"
+ if [ -n "${cmake_verbose}" ]; then
+   cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
+ fi