aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-11-03 13:43:32 -0700
committerChris Larson <chris_larson@mentor.com>2010-11-08 07:59:53 -0700
commita441183b79563e1984df06a002316a3850319ef5 (patch)
treeba9ffa74f4536100e8b7dc7e69587b63987b3f92
parentb1b0006059a6c8e9cf06fc14f2b4cb46736fb822 (diff)
downloadopenembedded-a441183b79563e1984df06a002316a3850319ef5.tar.gz
openembedded-a441183b79563e1984df06a002316a3850319ef5.tar.bz2
openembedded-a441183b79563e1984df06a002316a3850319ef5.zip
ncurses: drop lib/terminfo, fix .so hardcoding
Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--recipes/ncurses/ncurses.inc10
-rw-r--r--recipes/ncurses/ncurses_5.7.bb1
2 files changed, 6 insertions, 5 deletions
diff --git a/recipes/ncurses/ncurses.inc b/recipes/ncurses/ncurses.inc
index cdc181a69a..29bba1c6b0 100644
--- a/recipes/ncurses/ncurses.inc
+++ b/recipes/ncurses/ncurses.inc
@@ -40,13 +40,13 @@ export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
do_install() {
autotools_do_install
+ rm -f ${D}${libdir}/terminfo
# our ncurses has termcap support
- ln -sf libncurses.so ${D}${libdir}/libtermcap.so
+ ln -sf libncurses${SOLIBSDEV} ${D}${libdir}/libtermcap${SOLIBSDEV}
ln -sf libncurses.a ${D}${libdir}/libtermcap.a
ln -sf curses.h ${D}${includedir}/ncurses.h
-
# include some basic terminfo files
# stolen ;) from gentoo and modified a bit
for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm-color xterm-xfree86
@@ -58,8 +58,8 @@ do_install() {
then
install -d ${D}${sysconfdir}/terminfo/$basedir
mv $termfile ${D}${sysconfdir}/terminfo/$basedir/
- ln -s /etc/terminfo/$basedir/${x} \
- ${D}${datadir}/terminfo/$basedir/${x}
+ ln -sf ${sysconfdir}/terminfo/$basedir/$x \
+ ${D}${datadir}/terminfo/$basedir/$x
fi
done
# i think we can use xterm-color as default xterm
@@ -94,7 +94,7 @@ PACKAGES =+ "${PN}-tools ${PN}-terminfo"
FILES_${PN} = "\
${bindir}/tput \
${bindir}/tset \
- ${libdir}/lib*.so.* \
+ ${libdir}/lib*${SOLIBS} \
${datadir}/tabset \
${sysconfdir}/terminfo \
"
diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7.bb
index 715fff4e54..7081161dc8 100644
--- a/recipes/ncurses/ncurses_5.7.bb
+++ b/recipes/ncurses/ncurses_5.7.bb
@@ -134,6 +134,7 @@ do_install() {
! ${ENABLE_WIDEC} || \
oe_runmake -C widec ${_install_opts}
+ rm -f ${D}${libdir}/terminfo
cd narrowc