ncurses: fix packaging of moved libraries
This ensures packaging of the ncurses libraries moved to base_libdir is done correctly. (From OE-Core rev: a897c05ae5c70d81f4d88e7186f9bb9a721ee343) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a17165ae3a
commit
73371e121e
|
@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
|
||||||
SECTION = "libs"
|
SECTION = "libs"
|
||||||
DEPENDS = "ncurses-native"
|
DEPENDS = "ncurses-native"
|
||||||
DEPENDS_virtclass-native = ""
|
DEPENDS_virtclass-native = ""
|
||||||
INC_PR = "r6"
|
INC_PR = "r7"
|
||||||
|
|
||||||
inherit autotools binconfig multilib_header
|
inherit autotools binconfig multilib_header
|
||||||
|
|
||||||
|
@ -199,8 +199,11 @@ shell_do_install() {
|
||||||
|
|
||||||
python populate_packages_prepend () {
|
python populate_packages_prepend () {
|
||||||
libdir = d.expand("${libdir}")
|
libdir = d.expand("${libdir}")
|
||||||
|
base_libdir = d.expand("${base_libdir}")
|
||||||
pnbase = d.expand("${PN}-lib%s")
|
pnbase = d.expand("${PN}-lib%s")
|
||||||
do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
|
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}/ncurses5-config \
|
||||||
${bindir}/ncursesw5-config \
|
${bindir}/ncursesw5-config \
|
||||||
${datadir}/tabset \
|
${datadir}/tabset \
|
||||||
${base_libdir}/* \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
# This keeps only tput/tset in ncurses
|
# This keeps only tput/tset in ncurses
|
||||||
|
|
Loading…
Reference in New Issue