summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-13 23:40:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:12:43 +0000
commitfa15b1dfbf338969660a352deb870dfd5727bc47 (patch)
tree3429f03e3308878d1473b19c3688e404a6f07814
parent42a278ff7dc641b1700e56fbaf5a63947ff1161c (diff)
downloadopenembedded-core-fa15b1dfbf338969660a352deb870dfd5727bc47.tar.gz
openembedded-core-fa15b1dfbf338969660a352deb870dfd5727bc47.tar.bz2
openembedded-core-fa15b1dfbf338969660a352deb870dfd5727bc47.tar.xz
openembedded-core-fa15b1dfbf338969660a352deb870dfd5727bc47.zip
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@linux.intel.com>
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index e45086881..fe2c3e4b3 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