From 0b88a5b8260b308cf5c832cb82b9818426f2a478 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Sat, 22 Jan 2005 02:40:12 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/21 20:56:14-05:00 handhelds.org!kergoth Add sed 4.1.2. 2005/01/21 20:53:36-05:00 handhelds.org!kergoth ncurses: Create libtermcap symlinks, consolidate metadata into a .inc. 2005/01/21 20:48:18-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/01/21 20:48:08-05:00 handhelds.org!kergoth Add zile, a very small emacs-like editor. BKrev: 41f1bd0c7KKgxL0NpckmwXVKlGyleg --- packages/ncurses/ncurses.inc | 0 packages/ncurses/ncurses_5.3.bb | 54 ++----------------------------- packages/ncurses/ncurses_5.4.bb | 72 ++--------------------------------------- 3 files changed, 4 insertions(+), 122 deletions(-) create mode 100644 packages/ncurses/ncurses.inc (limited to 'packages/ncurses') diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ncurses/ncurses_5.3.bb b/packages/ncurses/ncurses_5.3.bb index 9e72551297..fb56af9723 100644 --- a/packages/ncurses/ncurses_5.3.bb +++ b/packages/ncurses/ncurses_5.3.bb @@ -1,61 +1,11 @@ BaseV := "${PV}" SnapV := "20030906" PV = "${BaseV}.${SnapV}" -LICENSE = "MIT" -DESCRIPTION = "Ncurses library" -SECTION = "libs" -DEPENDS = "ncurses-native" -PROVIDES = "${PV}-${BaseV} ${PV}-${BaseV}-${PR} \ - ${CATEGORY}/${PN}-${BaseV} ${CATEGORY}/${PN}-${BaseV}-${PR} " -PACKAGES_append = " ncurses-terminfo" -FILES_ncurses_append = " ${datadir}/tabset" -FILES_ncurses-terminfo = "${datadir}/terminfo" +PR = "r1" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${BaseV}.tar.gz \ file://${SnapV}.patch;patch=1 \ file://configure.patch;patch=1" S = "${WORKDIR}/ncurses-${BaseV}" -inherit autotools - -EXTRA_OECONF = "--with-shared \ - --without-profile \ - --without-debug \ - --disable-rpath \ - --enable-echo \ - --enable-const \ - --without-ada \ - --enable-termcap \ - --without-cxx-binding \ - --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \ - --enable-overwrite" -export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}" -export BUILD_LDFLAGS = "" - -do_configure_prepend () { - if [ -e aclocal.m4 -a ! -e acinclude.m4 ]; then - cat aclocal.m4 > acinclude.m4 - fi -} - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - gnu-configize - oe_runconf -} - -do_compile () { - oe_runmake BUILD_LDFLAGS="" 'BUILD_CCFLAGS=${BUILD_CCFLAGS}' -} - -do_stage () { - 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 - ln -sf curses.h ${STAGING_INCDIR}/ncurses.h - for i in ncurses panel form menu; do - oe_libinstall -so -C lib $i ${STAGING_LIBDIR} - done -} +include ncurses.inc diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index dbad531540..963ea46dc6 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -1,75 +1,7 @@ -DESCRIPTION = "Ncurses library" -HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" -LICENSE = "MIT" -SECTION = "libs" -DEPENDS = "ncurses-native" -PACKAGES_prepend = "ncurses-tools " -PACKAGES_append = " ncurses-terminfo" -FILES_ncurses_append = " ${datadir}/tabset" -RSUGGESTS_${PN} = "ncurses-terminfo" -PR = "r5" +PR = "r6" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://visibility.patch;patch=1" S = "${WORKDIR}/ncurses-${PV}" -inherit autotools - -# This keeps only tput/tset in ncurses -# clear/reset are in already busybox -FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear ${bindir}/reset ${bindir}/tack " -FILES_ncurses-terminfo = "${datadir}/terminfo" -FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo" - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--with-shared \ - --without-profile \ - --without-debug \ - --disable-rpath \ - --enable-echo \ - --enable-const \ - --without-ada \ - --enable-termcap \ - --without-cxx-binding \ - --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \ - --enable-overwrite" -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 -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 - ln -sf curses.h ${STAGING_INCDIR}/ncurses.h -} - -do_install() { - autotools_do_install - - # 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 - do - local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)" - local basedir="$(basename $(dirname "${termfile}"))" - - if [ -n "${termfile}" ] - then - install -d ${D}/etc/terminfo/${basedir} - mv ${termfile} ${D}/etc/terminfo/${basedir}/ - ln -s /etc/terminfo/${basedir}/${x} \ - ${D}/usr/share/terminfo/${basedir}/${x} - fi - done - # i think we can use xterm-color as default xterm - if [ -e ${D}/etc/terminfo/x/xterm-color ] - then - ln -sf xterm-color ${D}/etc/terminfo/x/xterm - fi -} +include ncursees.inc -- cgit 1.2.3-korg