diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 6 |
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 | |||
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | DEPENDS = "ncurses-native" | 7 | DEPENDS = "ncurses-native" |
8 | DEPENDS_virtclass-native = "" | 8 | DEPENDS_virtclass-native = "" |
9 | INC_PR = "r6" | 9 | INC_PR = "r7" |
10 | 10 | ||
11 | inherit autotools binconfig multilib_header | 11 | inherit autotools binconfig multilib_header |
12 | 12 | ||
@@ -199,8 +199,11 @@ shell_do_install() { | |||
199 | 199 | ||
200 | python populate_packages_prepend () { | 200 | python populate_packages_prepend () { |
201 | libdir = d.expand("${libdir}") | 201 | libdir = d.expand("${libdir}") |
202 | base_libdir = d.expand("${base_libdir}") | ||
202 | pnbase = d.expand("${PN}-lib%s") | 203 | pnbase = d.expand("${PN}-lib%s") |
203 | do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) | 204 | do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) |
205 | if libdir is not base_libdir: | ||
206 | do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) | ||
204 | } | 207 | } |
205 | 208 | ||
206 | 209 | ||
@@ -232,7 +235,6 @@ FILES_${PN} = "\ | |||
232 | ${bindir}/ncurses5-config \ | 235 | ${bindir}/ncurses5-config \ |
233 | ${bindir}/ncursesw5-config \ | 236 | ${bindir}/ncursesw5-config \ |
234 | ${datadir}/tabset \ | 237 | ${datadir}/tabset \ |
235 | ${base_libdir}/* \ | ||
236 | " | 238 | " |
237 | 239 | ||
238 | # This keeps only tput/tset in ncurses | 240 | # This keeps only tput/tset in ncurses |