diff options
| -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 | |||
| 4 | # Using cmake's internal libarchive, so some dependencies are needed | 4 | # Using cmake's internal libarchive, so some dependencies are needed |
| 5 | DEPENDS += "bzip2-native zlib-native" | 5 | DEPENDS += "bzip2-native zlib-native" |
| 6 | 6 | ||
| 7 | SRC_URI += "file://cmlibarchive-disable-ext2fs.patch" | 7 | SRC_URI += "\ |
| 8 | file://cmlibarchive-disable-ext2fs.patch \ | ||
| 9 | file://disable-bootstrap-cursesdialog.patch \ | ||
| 10 | " | ||
| 8 | 11 | ||
| 9 | SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66" | 12 | SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66" |
| 10 | SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e" | 13 | 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 @@ | |||
| 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 | ||
