[oe-commits] Paul Eggleton : ncurses: fix build when ENABLE_WIDEC is not set
git at git.openembedded.org
git at git.openembedded.org
Wed Mar 14 13:21:02 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: fa15b1dfbf338969660a352deb870dfd5727bc47
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fa15b1dfbf338969660a352deb870dfd5727bc47
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Tue Mar 13 23:40:03 2012 +0000
ncurses: fix build when ENABLE_WIDEC is not set
If wide character support is disabled (as it is with poky-tiny, for
example) then we won't have libncursesw.so.*, so skip moving these files
in that case. (Fixes a regression introduced in OE-Core revision
ccd370ab147b78de7a5bd74818f755f4d3ca6d81).
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
meta/recipes-core/ncurses/ncurses.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index e450868..fe2c3e4 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r5"
+INC_PR = "r6"
inherit autotools binconfig multilib_header
@@ -185,7 +185,8 @@ shell_do_install() {
# case will skip this code
mkdir ${D}${base_libdir}
mv ${D}${libdir}/libncurses.so.* ${D}${base_libdir}
- mv ${D}${libdir}/libncursesw.so.* ${D}${base_libdir}
+ ! ${ENABLE_WIDEC} || \
+ mv ${D}${libdir}/libncursesw.so.* ${D}${base_libdir}
mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
rm ${D}${libdir}/libtinfo.so
More information about the Openembedded-commits
mailing list