summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ncurses
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-03-14 13:15:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 23:34:01 +0000
commita897c05ae5c70d81f4d88e7186f9bb9a721ee343 (patch)
tree7ce15e319a31e5032c2ddfbdf9bbd87d8091c0c6 /meta/recipes-core/ncurses
parent9cbeae60e892370e50a9dd77ca4a66fb8d102e47 (diff)
downloadopenembedded-core-a897c05ae5c70d81f4d88e7186f9bb9a721ee343.tar.gz
openembedded-core-a897c05ae5c70d81f4d88e7186f9bb9a721ee343.tar.bz2
openembedded-core-a897c05ae5c70d81f4d88e7186f9bb9a721ee343.zip
ncurses: fix packaging of moved libraries
This ensures packaging of the ncurses libraries moved to base_libdir is done correctly. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ncurses')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index fe2c3e4b3f..331994975b 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