summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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:17:41 +0000
commitd1646743bcaf848691ba0c53326e31996d0be359 (patch)
tree6a3e7d5128566f4d5dfb3c42ab31304d3d392480 /meta/recipes-core
parentfc33926b7ff2207b05d125367de4df8c508cd219 (diff)
downloadpoky-d1646743bcaf848691ba0c53326e31996d0be359.tar.gz
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). (From OE-Core rev: fa15b1dfbf338969660a352deb870dfd5727bc47) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 e450868817..fe2c3e4b3f 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
6SECTION = "libs" 6SECTION = "libs"
7DEPENDS = "ncurses-native" 7DEPENDS = "ncurses-native"
8DEPENDS_virtclass-native = "" 8DEPENDS_virtclass-native = ""
9INC_PR = "r5" 9INC_PR = "r6"
10 10
11inherit autotools binconfig multilib_header 11inherit autotools binconfig multilib_header
12 12
@@ -185,7 +185,8 @@ shell_do_install() {
185 # case will skip this code 185 # case will skip this code
186 mkdir ${D}${base_libdir} 186 mkdir ${D}${base_libdir}
187 mv ${D}${libdir}/libncurses.so.* ${D}${base_libdir} 187 mv ${D}${libdir}/libncurses.so.* ${D}${base_libdir}
188 mv ${D}${libdir}/libncursesw.so.* ${D}${base_libdir} 188 ! ${ENABLE_WIDEC} || \
189 mv ${D}${libdir}/libncursesw.so.* ${D}${base_libdir}
189 190
190 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} 191 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
191 rm ${D}${libdir}/libtinfo.so 192 rm ${D}${libdir}/libtinfo.so