Patchwork [5/6] ncurses: fix build when ENABLE_WIDEC is not set

login
register
mail settings
Submitter Paul Eggleton
Date March 14, 2012, 12:36 a.m.
Message ID <22f0c46dcba251287bcc3848c1537ad943c53788.1331685330.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/23219/
State Accepted
Commit fa15b1dfbf338969660a352deb870dfd5727bc47
Headers show

Comments

Paul Eggleton - March 14, 2012, 12:36 a.m.
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>
---
 meta/recipes-core/ncurses/ncurses.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Darren Hart - March 14, 2012, 2:52 p.m.
On 03/13/2012 05:36 PM, Paul Eggleton wrote:
> 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>

Perfect, thanks Paul. Poky-tiny is now on the Yocto autobuilder which
should help catch when things like this creep in going forward.

--
Darren

> ---
>  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

Patch

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