aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim 'max_posedon' Melnikau <maxposedon@gmail.com>2009-06-20 22:40:09 +0000
committerMaksim 'max_posedon' Melnikau <maxposedon@gmail.com>2009-06-20 22:40:09 +0000
commitbe1e3be2cfedbcd56eb55a93794d0a4a78b37ff6 (patch)
tree64db695e4fbdb50cba4a779efd26d00067761976 /sys-libs
parentadd file-5.03 (diff)
downloadembedded-cross-be1e3be2cfedbcd56eb55a93794d0a4a78b37ff6.tar.gz
embedded-cross-be1e3be2cfedbcd56eb55a93794d0a4a78b37ff6.tar.bz2
embedded-cross-be1e3be2cfedbcd56eb55a93794d0a4a78b37ff6.zip
ncurses fix in portage now
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/ncurses/Manifest5
-rw-r--r--sys-libs/ncurses/files/cross-build.patch32
-rw-r--r--sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch24
-rw-r--r--sys-libs/ncurses/files/ncurses-5.7-cross-ncurses-config.patch16
-rw-r--r--sys-libs/ncurses/ncurses-5.7.ebuild157
5 files changed, 0 insertions, 234 deletions
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
deleted file mode 100644
index fe10cc9..0000000
--- a/sys-libs/ncurses/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cross-build.patch 1364 RMD160 2c7a4b7c5d5a971a6e4a1cd24077c1133dd17a55 SHA1 f240ba5d7583683c9a80e59f9994069fa6cb70c3 SHA256 d83bf42f85a90640115ff3bf6da1799763dc0e81b160dd5ec90d583fac0b9960
-AUX ncurses-5.6-gfbsd.patch 817 RMD160 2d5a96174730a93320e391cb057880df4996854e SHA1 b6798815c44059a00a2bcd4f9f28bbf74dfc0e2d SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065
-AUX ncurses-5.7-cross-ncurses-config.patch 473 RMD160 c295c55f80444a3ddd92b59958fce693d41ae82c SHA1 db6e59eade868d3749d37f76d57ea3d8500bf3e2 SHA256 202f5c181c39bc762e860956c62d942125b5f5e1e51f7a1b192b0a6d5d450815
-DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
-EBUILD ncurses-5.7.ebuild 4695 RMD160 591bb24db57de406f59387761aeac5513b39767d SHA1 5d488111c02bd113e2d562478d52b38590b73f3d SHA256 5131613bd3ba554a95289ff94f90cc9c6081e5a4490432c0b0a7829efd9f9c70
diff --git a/sys-libs/ncurses/files/cross-build.patch b/sys-libs/ncurses/files/cross-build.patch
deleted file mode 100644
index d721235..0000000
--- a/sys-libs/ncurses/files/cross-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../ncurses/cross-build.patch
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-Of course one must not inject the cross systems include directory for the
-system compiler ...
-
- - Rene Rebe <rene@exactcode.de>
-
---- ncurses-5.5/ncurses/Makefile.in.vanilla 2006-10-08 12:42:43.000000000 +0000
-+++ ncurses-5.5/ncurses/Makefile.in 2006-10-08 12:49:55.000000000 +0000
-@@ -94,7 +94,7 @@
-
- BUILD_CPPFLAGS = -I../include @BUILD_CPPFLAGS@
- BUILD_CC = @BUILD_CC@
--BUILD_CCFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@
-+BUILD_CCFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@ -DHAVE_CONFIG_H -D_GNU_SOURCE
- BUILD_LDFLAGS = @BUILD_LDFLAGS@
- BUILD_LIBS = @BUILD_LIBS@
-
diff --git a/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch
deleted file mode 100644
index 4dc51d3..0000000
--- a/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-we'll hijack the freebsd* case that comes later
-
---- ncurses-5.6/aclocal.m4
-+++ ncurses-5.6/aclocal.m4
-@@ -3806,7 +3806,7 @@
- MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
- cf_cv_rm_so_locs=yes
- ;;
-- linux*|gnu*|k*bsd*-gnu)
-+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
- if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
---- ncurses-5.6/configure
-+++ ncurses-5.6/configure
-@@ -3806,7 +3806,7 @@
- MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
- cf_cv_rm_so_locs=yes
- ;;
-- linux*|gnu*|k*bsd*-gnu)
-+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
- if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
diff --git a/sys-libs/ncurses/files/ncurses-5.7-cross-ncurses-config.patch b/sys-libs/ncurses/files/ncurses-5.7-cross-ncurses-config.patch
deleted file mode 100644
index db5ca82..0000000
--- a/sys-libs/ncurses/files/ncurses-5.7-cross-ncurses-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- misc/ncurses-config.in 2009-05-11 18:20:59.000000000 +0000
-+++ misc/ncurses-config.in.new 2009-05-11 18:20:25.000000000 +0000
-@@ -86,8 +86,12 @@
- ENDECHO
- ;;
- --libs)
-+ LIBS=
-+ if test "${exec_prefix}/lib" != /usr/lib ; then
-+ LIBS="-L${exec_prefix}/libs"
-+ fi
- sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-- -L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
-+ $LIBS @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
- ENDECHO
- ;;
- # identification
diff --git a/sys-libs/ncurses/ncurses-5.7.ebuild b/sys-libs/ncurses/ncurses-5.7.ebuild
deleted file mode 100644
index c2e7dbc..0000000
--- a/sys-libs/ncurses/ncurses-5.7.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7.ebuild,v 1.5 2009/04/29 22:17:49 ssuominen Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_PV=${PV:0:3}
-PV_SNAP=${PV:4}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="console display library"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ada debug doc gpm minimal nocxx profile trace unicode"
-
-DEPEND="gpm? ( sys-libs/gpm )"
-# berkdb? ( sys-libs/db )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
- epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch
- epatch "${FILESDIR}"/cross-build.patch
- epatch "${FILESDIR}/${P}-cross-ncurses-config.patch"
-}
-
-src_compile() {
- tc-export BUILD_CC
-
- # Protect the user from themselves #115036
- unset TERMINFO
-
- local myconf=""
- use nocxx && myconf="${myconf} --without-cxx --without-cxx-binding"
- use ada || myconf="${myconf} --without-ada"
-
- # First we build the regular ncurses ...
- mkdir "${WORKDIR}"/narrowc
- cd "${WORKDIR}"/narrowc
- do_compile ${myconf}
-
- # Then we build the UTF-8 version
- if use unicode ; then
- mkdir "${WORKDIR}"/widec
- cd "${WORKDIR}"/widec
- do_compile ${myconf} --enable-widec --includedir=/usr/include/ncursesw
- fi
-}
-do_compile() {
- ECONF_SOURCE=${S}
-
- # The chtype/mmask-t settings below are to retain ABI compat
- # with ncurses-5.4 so dont change em !
- local conf_abi="
- --with-chtype=long \
- --with-mmask-t=long \
- --disable-ext-colors \
- --disable-ext-mouse \
- --without-pthread \
- --without-reentrant \
- "
- # We need the basic terminfo files in /etc, bug #37026. We will
- # add '--with-terminfo-dirs' and then populate /etc/terminfo in
- # src_install() ...
-# $(use_with berkdb hashed-db)
- econf \
- --libdir="/$(get_libdir)" \
- --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
- --with-shared \
- --without-hashed-db \
- $(use_with debug) \
- $(use_with profile) \
- $(use_with gpm) \
- --disable-termcap \
- --enable-symlinks \
- --with-rcs-ids \
- --with-manpage-format=normal \
- --enable-const \
- --enable-colorfgbg \
- --enable-echo \
- $(use_enable !ada warnings) \
- $(use_with debug assertions) \
- $(use_with !debug leaks) \
- $(use_with debug expanded) \
- $(use_with !debug macros) \
- $(use_with trace) \
- ${conf_abi} \
- "$@" \
- || die "configure failed"
-
- # A little hack to fix parallel builds ... they break when
- # generating sources so if we generate the sources first (in
- # non-parallel), we can then build the rest of the package
- # in parallel. This is not really a perf hit since the source
- # generation is quite small. -vapier
- emake -j1 sources || die "make sources failed"
- emake || die "make failed"
-}
-
-src_install() {
- # install unicode version second so that the binaries in /usr/bin
- # support both wide and narrow
- cd "${WORKDIR}"/narrowc
- emake DESTDIR="${D}" install || die "make narrowc install failed"
- if use unicode ; then
- cd "${WORKDIR}"/widec
- emake DESTDIR="${D}" install || die "make widec install failed"
- fi
-
- # Move static and extraneous ncurses libraries out of /lib
- dodir /usr/$(get_libdir)
- cd "${D}"/$(get_libdir)
- mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
- gen_usr_ldscript lib{,n}curses.so
- if use unicode ; then
- mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
- gen_usr_ldscript libncursesw.so
- fi
-
-# if ! use berkdb ; then
- # We need the basic terminfo files in /etc, bug #37026
- einfo "Installing basic terminfo files in /etc..."
- for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} \
- xterm 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
- dodir /etc/terminfo/${basedir}
- mv ${termfile} "${D}"/etc/terminfo/${basedir}/
- dosym ../../../../etc/terminfo/${basedir}/${x} \
- /usr/share/terminfo/${basedir}/${x}
- fi
- done
-
- # Build fails to create this ...
- dosym ../share/terminfo /usr/$(get_libdir)/terminfo
-# fi
-
- echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
- doenvd "${T}"/50ncurses
-
- use minimal && rm -r "${D}"/usr/share/terminfo*
- # Because ncurses5-config --terminfo returns the directory we keep it
- keepdir /usr/share/terminfo #245374
-
- cd "${S}"
- dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
- use doc && dohtml -r doc/html/
-}