[oe] [PATCH v2] ncurses-5.7 : fix sdk build + add libtermcap link
Eric Bénard
eric at eukrea.com
Sun Aug 29 11:22:50 UTC 2010
- fix ncurses-sdk build (compile tested on ubuntu using angstrom
2010.x and 2008.1 for armv6 target on i686 host)
- fix asterisk build (by adding libtermcap's link), compile tested
on angstrom 2008.1 for armv6
Signed-off-by: Eric Bénard <eric at eukrea.com>
---
v2 : remove wrong RPROVIDES/CONFLICTS/REPLACES
recipes/ncurses/ncurses_5.7.bb | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7.bb
index 57374ec..6866ffb 100644
--- a/recipes/ncurses/ncurses_5.7.bb
+++ b/recipes/ncurses/ncurses_5.7.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
SECTION = "libs"
PATCHDATE = "20100501"
PKGV = "${PV}+${PATCHDATE}"
-PR = "r11"
+PR = "r12"
DEPENDS = "ncurses-native unifdef-native"
DEPENDS_virtclass-native = "unifdef-native"
@@ -32,15 +32,15 @@ EXTRA_AUTORECONF = "-I m4"
ENABLE_WIDEC = "true"
# Build breaks on Ubuntu else :(
ENABLE_WIDEC_virtclass-native = "false"
-
+ENABLE_WIDEC_virtclass-sdk = "false"
# Override the function from the autotools class; ncurses requires a
# patched autoconf213 to generate the configure script. This autoconf
# is not available so that the shipped script will be used.
do_configure() {
for i in \
- 'narrowc --with-ticlib' \
- 'widec --enable-widec --without-progs'; do
+ 'narrowc --with-ticlib' \
+ 'widec --with-ticlib --enable-widec --without-progs'; do
set -- $i
mkdir -p $1
cd $1
@@ -144,6 +144,11 @@ do_install() {
ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
fi
+ cd ${D}${libdir}
+ ln -sf libncurses.so libtermcap.so
+ ln -sf libncurses.a libtermcap.a
+ ln -sf libncurses.so.5 libtermcap.so.5
+
if [ "${PN}" = "ncurses" ]; then
mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN}
mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN}
@@ -155,7 +160,6 @@ python populate_packages_prepend () {
do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'ncurses-lib%s', 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
}
-
pkg_postinst_ncurses-tools () {
if [ "${PN}" = "ncurses" ]; then
update-alternatives --install ${bindir}/clear clear clear.${PN} 100
@@ -172,16 +176,12 @@ pkg_prerm_ncurses-tools () {
BBCLASSEXTEND = "native sdk"
-PACKAGES = " \
- ncurses-dbg \
- ncurses-dev \
- ncurses-doc \
- ncurses-tools \
- ncurses \
- ncurses-static \
- ncurses-terminfo \
+PACKAGES += " \
+ ${PN}-tools \
+ ${PN}-terminfo \
"
-RSUGGESTS_${PN} = "ncurses-terminfo"
+
+RSUGGESTS_${PN} = "${PN}-terminfo"
FILES_${PN} = "\
${bindir}/tput \
@@ -192,7 +192,7 @@ FILES_${PN} = "\
# This keeps only tput/tset in ncurses
# clear/reset are in already busybox
-FILES_ncurses-tools = "\
+FILES_${PN}-tools = "\
${bindir}/tic \
${bindir}/toe \
${bindir}/infotocap \
@@ -204,6 +204,6 @@ FILES_ncurses-tools = "\
${bindir}/tabs \
"
-FILES_ncurses-terminfo = "\
+FILES_${PN}-terminfo = "\
${datadir}/terminfo \
"
--
1.6.3.3
More information about the Openembedded-devel
mailing list