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:50:44 +0100 |
| commit | 4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51 (patch) | |
| tree | 69f201f6ed856515ee0b295cce8b4074219c2330 /meta/recipes-devtools/cmake | |
| parent | 2b6a1cf9c7e05d204df82aa962d3ae09744dd86a (diff) | |
| download | openembedded-core-4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51.tar.gz openembedded-core-4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51.tar.bz2 openembedded-core-4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51.zip | |
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.
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')
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake/disable-bootstrap-cursesdialog.patch | 17 |
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 # 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 0000000000..9d378fb24c --- /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 |