diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-03-23 05:11:36 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-03-23 05:11:36 +0000 |
| commit | a32b3aae375f18dfeae3bb3943f865b04110d632 (patch) | |
| tree | 47bc6fcfcdb3fc92aa2bbb805b80142ba9bc4cf9 /app-shells | |
| parent | Respect LDFLAGS when compiling tbz2tool. Thanks to Flameeyes for reporting. (diff) | |
| download | gentoo-2-a32b3aae375f18dfeae3bb3943f865b04110d632.tar.gz gentoo-2-a32b3aae375f18dfeae3bb3943f865b04110d632.tar.bz2 gentoo-2-a32b3aae375f18dfeae3bb3943f865b04110d632.zip | |
back port static ncurses linking changes
(Portage version: 2.1_pre6-r5)
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/bash-2.05b-r11.ebuild | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/app-shells/bash/bash-2.05b-r11.ebuild b/app-shells/bash/bash-2.05b-r11.ebuild index 67a802a332bb..ad010961e84c 100644 --- a/app-shells/bash/bash-2.05b-r11.ebuild +++ b/app-shells/bash/bash-2.05b-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r11.ebuild,v 1.9 2006/03/08 01:21:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r11.ebuild,v 1.10 2006/03/23 05:11:36 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -25,29 +25,29 @@ RDEPEND="" src_unpack() { unpack ${P}.tar.gz - cd ${S} - epatch ${DISTDIR}/${P}-gentoo.diff.bz2 + cd "${S}" + epatch "${DISTDIR}"/${P}-gentoo.diff.bz2 for x in ${PLEVEL//x} do - epatch ${DISTDIR}/${PN}${PV/\.}-${x} + epatch "${DISTDIR}"/${PN}${PV/\.}-${x} done # Remove autoconf dependency sed -i -e "/&& autoconf/d" Makefile.in # Readline is slow with multibyte locale, bug #19762 - epatch ${FILESDIR}/${P}-multibyte-locale.patch + epatch "${FILESDIR}"/${P}-multibyte-locale.patch # Segfault on empty herestring - epatch ${FILESDIR}/${P}-empty-herestring.patch + epatch "${FILESDIR}"/${P}-empty-herestring.patch # Fix broken rbash functionality - epatch ${FILESDIR}/${P}-rbash.patch + epatch "${FILESDIR}"/${P}-rbash.patch # Fix parallel make, bug #41002. - epatch ${FILESDIR}/${P}-parallel-build.patch + epatch "${FILESDIR}"/${P}-parallel-build.patch # Fix using bash with post-20040808 glibc ebuilds (from fedora) - epatch ${FILESDIR}/${P}-jobs.patch + epatch "${FILESDIR}"/${P}-jobs.patch # Fix bash call to setlocale #64266 - epatch ${FILESDIR}/${P}-setlocale.patch + epatch "${FILESDIR}"/${P}-setlocale.patch # Enable SSH_SOURCE_BASHRC (#24762) echo '#define SSH_SOURCE_BASHRC' >> config-top.h @@ -86,20 +86,15 @@ src_compile() { #use static && export LDFLAGS="${LDFLAGS} -static" use nls || myconf="${myconf} --disable-nls" - echo 'int main(){}' > ${T}/term-test.c - if ! $(tc-getCC) -static -lncurses ${T}/term-test.c 2> /dev/null ; then - export bash_cv_termcap_lib=gnutermcap - else - export bash_cv_termcap_lib=libcurses - myconf="${myconf} --with-curses" - fi + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses + export bash_cv_termcap_lib=libcurses + myconf="${myconf} --with-curses" econf \ --disable-profiling \ --without-gnu-malloc \ ${myconf} || die - # Make sure we always link statically with ncurses - sed -i "/^TERMCAP_LIB/s:-lncurses:-Wl,-Bstatic -lncurses -Wl,-Bdynamic:" Makefile || die "sed failed" emake || die "make failed" } @@ -114,7 +109,7 @@ src_install() { use minimal && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug* insinto /etc/bash - doins ${FILESDIR}/bashrc + doins "${FILESDIR}"/bashrc if use build; then rm -rf ${D}/usr |