summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-06-13 22:43:43 +0000
committerTim Harder <radhermit@gentoo.org>2012-06-13 22:43:43 +0000
commit2c919b87bc03988a036c9d146135bd82d31bc1c6 (patch)
tree694afe428b6b79f8b137f0537062d594fac6ef68 /net-dialup/lrzsz
parentAdd patch to use LDFLAGS properly (diff)
downloadgentoo-2-2c919b87bc03988a036c9d146135bd82d31bc1c6.tar.gz
gentoo-2-2c919b87bc03988a036c9d146135bd82d31bc1c6.tar.bz2
gentoo-2-2c919b87bc03988a036c9d146135bd82d31bc1c6.zip
Fix build with automake-2.12 (bug #420691).
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'net-dialup/lrzsz')
-rw-r--r--net-dialup/lrzsz/ChangeLog6
-rw-r--r--net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch28
-rw-r--r--net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild5
3 files changed, 36 insertions, 3 deletions
diff --git a/net-dialup/lrzsz/ChangeLog b/net-dialup/lrzsz/ChangeLog
index 71ea3d8391ce..08ff9f547bba 100644
--- a/net-dialup/lrzsz/ChangeLog
+++ b/net-dialup/lrzsz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/lrzsz
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.29 2012/04/06 21:55:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.30 2012/06/13 22:43:43 radhermit Exp $
+
+ 13 Jun 2012; Tim Harder <radhermit@gentoo.org> lrzsz-0.12.20-r3.ebuild,
+ +files/lrzsz-0.12.20-automake-2.12.patch:
+ Fix build with automake-2.12 (bug #420691).
06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Drop maintainer due retirement, bug #63588
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch
new file mode 100644
index 000000000000..c5ecdee208d0
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch
@@ -0,0 +1,28 @@
+--- lrzsz-0.12.20/configure.in
++++ lrzsz-0.12.20/configure.in
+@@ -97,7 +97,6 @@
+ AC_ISC_POSIX
+ AC_USE_SYSTEM_EXTENSIONS
+ AM_GNU_GETTEXT
+-AM_C_PROTOTYPES
+ AC_C_CONST
+ AC_C_INLINE
+
+--- lrzsz-0.12.20/lib/Makefile.am
++++ lrzsz-0.12.20/lib/Makefile.am
+@@ -1,5 +1,4 @@
+ noinst_LIBRARIES=libzmodem.a
+-AUTOMAKE_OPTIONS=ansi2knr
+
+ EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
+ getopt.c getopt1.c mkdir.c mktime.c \
+--- lrzsz-0.12.20/src/Makefile.am
++++ lrzsz-0.12.20/src/Makefile.am
+@@ -7,7 +7,6 @@
+ DISTCLEAN_FILES=lrzszbug
+
+ LDADD = ../lib/libzmodem.a @INTLLIBS@
+-AUTOMAKE_OPTIONS=ansi2knr
+ EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
+ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
+ #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
index 8537c13acc09..17f343b75d47 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.8 2011/01/15 20:01:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.9 2012/06/13 22:43:43 radhermit Exp $
EAPI="2"
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-autotools.patch
epatch "${FILESDIR}"/${PN}-implicit-decl.patch
+ epatch "${FILESDIR}"/${P}-automake-2.12.patch
# automake is unhappy if this is missing
>> config.rpath