diff options
| author |   Javier Villavicencio <the_paya@gentoo.org> | 2010-03-24 04:14:27 +0000 |
|---|---|---|
| committer | Javier Villavicencio <the_paya@gentoo.org> | 2010-03-24 04:14:27 +0000 |
| commit | 1f9d1c1fa42747fc4f0cb133c32d6160ee60c24e (patch) | |
| tree | 6495b1eaa8081db4f85484dcd5570f4f511e74a8 /sys-libs/readline | |
| parent | Bug #278633: add in support for mysql root password from secure config file. (diff) | |
| download | gentoo-2-1f9d1c1fa42747fc4f0cb133c32d6160ee60c24e.tar.gz gentoo-2-1f9d1c1fa42747fc4f0cb133c32d6160ee60c24e.tar.bz2 gentoo-2-1f9d1c1fa42747fc4f0cb133c32d6160ee60c24e.zip | |
Fix for bug 301508, rlfe build on FreeBSD.
(Portage version: 2.2_rc67/cvs/FreeBSD i386)
Diffstat (limited to 'sys-libs/readline')
| -rw-r--r-- | sys-libs/readline/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch | 16 | ||||
| -rw-r--r-- | sys-libs/readline/readline-6.1_p2.ebuild | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog index e7eff5823810..d63a8e853ccd 100644 --- a/sys-libs/readline/ChangeLog +++ b/sys-libs/readline/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/readline # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.153 2010/03/23 20:42:06 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.154 2010/03/24 04:14:27 the_paya Exp $ + + 24 Mar 2010; Javier Villavicencio <the_paya@gentoo.org> + readline-6.1_p2.ebuild, +files/readline-6.1-rlfe-freebsd.patch: + Fix for bug 301508, rlfe build on FreeBSD. 23 Mar 2010; Brent Baude <ranger@gentoo.org> readline-6.1.ebuild: stable ppc, bug 310819 diff --git a/sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch b/sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch new file mode 100644 index 000000000000..e9a051eacb82 --- /dev/null +++ b/sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch @@ -0,0 +1,16 @@ +FreeBSD-8 dropped sgtty.h in favor of termios.h, +without this rlfe build on FreeBSD-8 fails with a +missing sgtty.h. +See also bug #301508. + +--- readline-6.1/examples/rlfe/os.h.orig ++++ readline-6.1/examples/rlfe/os.h +@@ -186,7 +186,7 @@ + * terminal handling + */ + +-#ifdef POSIX ++#if defined(POSIX) || defined(__FreeBSD__) + # include <termios.h> + # ifdef hpux + # include <bsdtty.h> diff --git a/sys-libs/readline/readline-6.1_p2.ebuild b/sys-libs/readline/readline-6.1_p2.ebuild index 6a6c14de19b3..810ca4df2602 100644 --- a/sys-libs/readline/readline-6.1_p2.ebuild +++ b/sys-libs/readline/readline-6.1_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.1_p2.ebuild,v 1.1 2010/03/23 02:23:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.1_p2.ebuild,v 1.2 2010/03/24 04:14:27 the_paya Exp $ inherit autotools eutils multilib toolchain-funcs flag-o-matic @@ -50,6 +50,7 @@ src_unpack() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952 + epatch "${FILESDIR}"/${PN}-6.1-rlfe-freebsd.patch # 301508 # force ncurses linking #71420 sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" |