diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-25 23:10:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-25 23:10:10 +0000 |
| commit | 6ae80d26414be7e5738f3245b933e785e2630278 (patch) | |
| tree | cd2d0d90b857323068a58f73e68f60d473353f0b /sys-fs/xfsprogs | |
| parent | Fix paths encoded in man pages #432668 by Diego Elio Pettenò. (diff) | |
| download | gentoo-2-6ae80d26414be7e5738f3245b933e785e2630278.tar.gz gentoo-2-6ae80d26414be7e5738f3245b933e785e2630278.tar.bz2 gentoo-2-6ae80d26414be7e5738f3245b933e785e2630278.zip | |
Link libxcmd against readline #432644 by David Badia.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/xfsprogs')
| -rw-r--r-- | sys-fs/xfsprogs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch | 35 | ||||
| -rw-r--r-- | sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog index bfeae37d4084..c80345a21e15 100644 --- a/sys-fs/xfsprogs/ChangeLog +++ b/sys-fs/xfsprogs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/xfsprogs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.151 2012/08/19 17:11:32 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.152 2012/08/25 23:10:10 vapier Exp $ + + 25 Aug 2012; Mike Frysinger <vapier@gentoo.org> + +files/xfsprogs-3.1.8-readline.patch, xfsprogs-3.1.8.ebuild: + Link libxcmd against readline #432644 by David Badia. 19 Aug 2012; Raúl Porcel <armin76@gentoo.org> xfsprogs-3.1.8.ebuild: alpha/ia64/sh/sparc stable wrt #422225 diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch new file mode 100644 index 000000000000..c4f794e186e2 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch @@ -0,0 +1,35 @@ +From 52548f087e9c5ff05c9f43c859114cf2066f133b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 25 Aug 2012 19:06:28 -0400 +Subject: [PATCH] libxcmd: link against readline + +This library uses readline funcs (the input.c file), so we need to link +this shared library against it. + +URL: https://bugs.gentoo.org/432644 +Reported-by: David Badia <dbadia@gmail.com> +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + libxcmd/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libxcmd/Makefile b/libxcmd/Makefile +index b3544f4..ce082a5 100644 +--- a/libxcmd/Makefile ++++ b/libxcmd/Makefile +@@ -22,10 +22,12 @@ endif + + ifeq ($(ENABLE_READLINE),yes) + LCFLAGS += -DENABLE_READLINE ++LTLIBS += $(LIBREADLINE) $(LIBTERMCAP) + endif + + ifeq ($(ENABLE_EDITLINE),yes) + LCFLAGS += -DENABLE_EDITLINE ++LTLIBS += $(LIBEDITLINE) $(LIBTERMCAP) + endif + + default: ltdepend $(LTLIBRARY) +-- +1.7.9.7 + diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild index 3dca993aeec0..d41a11343ee6 100644 --- a/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild,v 1.8 2012/08/19 17:11:32 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild,v 1.9 2012/08/25 23:10:10 vapier Exp $ EAPI="4" @@ -38,6 +38,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch + epatch "${FILESDIR}"/${PN}-3.1.8-readline.patch sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ |