diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-09-29 12:12:05 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-29 12:12:05 +0000 |
| commit | 15321fab4d27421977520ba783367a6ab5572207 (patch) | |
| tree | c6c0e82bbf112d181fc57a7e4b93056427af4dcb | |
| parent | 18239318c7ed794f9b2959be8a9702569468cc31 (diff) | |
| parent | fa83931aaa6c899c2400e3f47a3b693bb16f5fd8 (diff) | |
merge of 68c930a87450b83ee412109725aa2845c4653e11
and 6b859f9dad018680c0cb717f227911f81f1ba1c8
| -rw-r--r-- | classes/autotools.bbclass | 12 | ||||
| -rw-r--r-- | packages/ncurses/ncurses.inc | 10 | ||||
| -rw-r--r-- | packages/readline/readline_4.3.bb | 22 |
3 files changed, 19 insertions, 25 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index ec1d4af1a4..8d448ce0d3 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -150,4 +150,16 @@ autotools_stage_includes() { fi } +autotools_stage_all() { + if [ "${INHIBIT_AUTO_STAGE}" != "1" ] + then + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + rm -rf ${STAGE_TEMP} + fi +} + EXPORT_FUNCTIONS do_configure do_install diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc index f400617dcb..96679db0cb 100644 --- a/packages/ncurses/ncurses.inc +++ b/packages/ncurses/ncurses.inc @@ -33,14 +33,8 @@ export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}" export BUILD_LDFLAGS = "" export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"' -do_stage () { - for i in libncurses libpanel libform libmenu; do - oe_libinstall -so -a -C lib $i ${STAGING_LIBDIR} - done - for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \ - termcap.h term.h unctrl.h; do - install -m 0644 include/$h ${STAGING_INCDIR}/ - done +do_stage() { + autotools_stage_all ln -sf curses.h ${STAGING_INCDIR}/ncurses.h ln -sf libncurses.so ${STAGING_LIBDIR}/libtermcap.so ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a diff --git a/packages/readline/readline_4.3.bb b/packages/readline/readline_4.3.bb index 234d697dfb..d0ff2a8d7c 100644 --- a/packages/readline/readline_4.3.bb +++ b/packages/readline/readline_4.3.bb @@ -4,12 +4,11 @@ additional functions to maintain a list of previously-entered command lines, to lines, and perform csh-like history expansion on previous commands." SECTION = "libs" PRIORITY = "optional" -MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPLv2" DEPENDS += "ncurses" RPROVIDES_${PN} += "readline" LEAD_SONAME = "libreadline.so" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \ file://shlink-termcap.patch;patch=1 \ @@ -23,24 +22,13 @@ do_configure () { autotools_do_configure } +do_stage() { + autotools_stage_all +} + do_install () { autotools_do_install # Make install doesn't properly install these oe_libinstall -so -C shlib libhistory ${D}${libdir} oe_libinstall -so -C shlib libreadline ${D}${libdir} } - -do_stage() { - oe_libinstall -a libhistory ${STAGING_LIBDIR} - oe_libinstall -a libreadline ${STAGING_LIBDIR} - oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR} - oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/readline - for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \ - rlconf.h rltypedefs.h - do - install -m 0644 $f ${STAGING_INCDIR}/readline/ - done - -} |