Patchwork [1/2] ncurses: fix packaging of moved libraries

login
register
mail settings
Submitter Scott Garman
Date March 14, 2012, 8:15 p.m.
Message ID <758e3bcd293ff4d4ed4b729f732beca4eeb6d5c1.1331756004.git.scott.a.garman@intel.com>
Download mbox | patch
Permalink /patch/23355/
State Accepted
Commit a897c05ae5c70d81f4d88e7186f9bb9a721ee343
Headers show

Comments

Scott Garman - March 14, 2012, 8:15 p.m.
This ensures packaging of the ncurses libraries moved to
base_libdir is done correctly.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-core/ncurses/ncurses.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index fe2c3e4..3319949 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 = "r6"
+INC_PR = "r7"
 
 inherit autotools binconfig multilib_header
 
@@ -199,8 +199,11 @@  shell_do_install() {
 
 python populate_packages_prepend () {
         libdir = d.expand("${libdir}")
+        base_libdir = d.expand("${base_libdir}")
         pnbase = d.expand("${PN}-lib%s")
         do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
+        if libdir is not base_libdir:
+            do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
 }
 
 
@@ -232,7 +235,6 @@  FILES_${PN} = "\
   ${bindir}/ncurses5-config \
   ${bindir}/ncursesw5-config \
   ${datadir}/tabset \
-  ${base_libdir}/* \
 "
 
 # This keeps only tput/tset in ncurses