diff options
| -rw-r--r-- | sys-libs/readline/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch | 14 | ||||
| -rw-r--r-- | sys-libs/readline/readline-6.2_p5.ebuild | 130 |
3 files changed, 153 insertions, 1 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog index 2a3d00a933d1..fa18ad265d99 100644 --- a/sys-libs/readline/ChangeLog +++ b/sys-libs/readline/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-libs/readline # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.183 2013/02/17 23:40:35 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.184 2013/12/25 23:44:29 vapier Exp $ + +*readline-6.2_p5 (25 Dec 2013) + + 25 Dec 2013; Mike Frysinger <vapier@gentoo.org> + +files/readline-6.2-rlfe-tgoto.patch, +readline-6.2_p5.ebuild: + Version bump. Fix tgoto test in rlfe example #385091 by Agostino Sarubbo. + Use pkg-config to get ncurses linking info #457558 by Travis Hansen. Export + AR ourselves to use a better default #484866 by Agostino Sarubbo. 17 Feb 2013; Zac Medico <zmedico@gentoo.org> readline-6.2_p4.ebuild: Add ~arm-linux keyword. diff --git a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch new file mode 100644 index 000000000000..b898bf053ecc --- /dev/null +++ b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/385091 + +https://lists.gnu.org/archive/html/bug-readline/2011-10/msg00000.html + +--- a/examples/rlfe/configure ++++ b/examples/rlfe/configure +@@ -4062,6 +4062,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + ++extern char *tgoto(char *, int, int); + main() + { + exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); diff --git a/sys-libs/readline/readline-6.2_p5.ebuild b/sys-libs/readline/readline-6.2_p5.ebuild new file mode 100644 index 000000000000..9e7db6ac884e --- /dev/null +++ b/sys-libs/readline/readline-6.2_p5.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5.ebuild,v 1.1 2013/12/25 23:44:29 vapier Exp $ + +EAPI="4" + +inherit eutils multilib toolchain-funcs flag-o-matic + +# Official patches +# See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_PV=${MY_PV/_/-} +MY_P=${PN}-${MY_PV} +[[ ${PV} != *_p* ]] && PLEVEL=0 +patches() { + [[ ${PLEVEL} -eq 0 ]] && return 1 + local opt=$1 + eval set -- {1..${PLEVEL}} + set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") + if [[ ${opt} == -s ]] ; then + echo "${@/#/${DISTDIR}/}" + else + local u + for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do + printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" + done + fi +} + +DESCRIPTION="Another cute console display library" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +IUSE="static-libs" + +RDEPEND=">=sys-libs/ncurses-5.2-r2" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + [[ ${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.2-rlfe-tgoto.patch #385091 + + # Force ncurses linking. #71420 + # Use pkg-config to get the right values. #457558 + sed -i \ + -e "s:^SHLIB_LIBS=:SHLIB_LIBS='$($(tc-getPKG_CONFIG) ncurses --libs)':" \ + support/shobj-conf || die + + # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated + # objformat for years, so we don't want to rely on that. + sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die + + ln -s ../.. examples/rlfe/readline # for local readline headers +} + +src_configure() { + # fix implicit decls with widechar funcs + append-cppflags -D_GNU_SOURCE + # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html + append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free + + # Force the test since we used sed above to force it. + export bash_cv_termcap_lib=ncurses + + # Make sure configure picks a better ar than `ar`. #484866 + tc-export AR + + # This is for rlfe, but we need to make sure LDFLAGS doesn't change + # so we can re-use the config cache file between the two. + append-ldflags -L. + econf \ + --cache-file="${S}"/config.cache \ + --with-curses \ + $(use_enable static-libs static) + + if ! tc-is-cross-compiler ; then + # code is full of AC_TRY_RUN() + cd examples/rlfe + econf --cache-file="${S}"/config.cache + fi +} + +src_compile() { + emake + + if ! tc-is-cross-compiler ; then + # code is full of AC_TRY_RUN() + cd examples/rlfe + local l + for l in readline history ; do + ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) + ln -sf ../../lib${l}.a lib${l}.a + done + emake + fi +} + +src_install() { + default + gen_usr_ldscript -a readline history #4411 + + if ! tc-is-cross-compiler; then + dobin examples/rlfe/rlfe + fi + +# dodoc CHANGELOG CHANGES README USAGE NEWS + docinto ps + dodoc doc/*.ps + dohtml -r doc +} + +pkg_preinst() { + preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865 +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} +} |