summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-23 08:59:12 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-23 08:59:12 +0000
commitd5f5ad2315079865b87c4b9da4fc7b0321fd137c (patch)
tree69f100f20f7eb009e9b116d14736c0f793ccabad /www-servers
parentamd64 really stable (diff)
downloadgentoo-2-d5f5ad2315079865b87c4b9da4fc7b0321fd137c.tar.gz
gentoo-2-d5f5ad2315079865b87c4b9da4fc7b0321fd137c.tar.bz2
gentoo-2-d5f5ad2315079865b87c4b9da4fc7b0321fd137c.zip
Fix building with sys-devel/automake >= 1.12 wrt #420599 by Dennis Yxun
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/lighttpd/ChangeLog6
-rw-r--r--www-servers/lighttpd/files/lighttpd-1.4.31-automake-1.12.patch21
-rw-r--r--www-servers/lighttpd/lighttpd-1.4.31.ebuild3
3 files changed, 28 insertions, 2 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 58e76b282e38..3d5f657704ae 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/lighttpd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.277 2012/06/01 21:12:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.278 2012/06/23 08:59:12 ssuominen Exp $
+
+ 23 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> lighttpd-1.4.31.ebuild,
+ +files/lighttpd-1.4.31-automake-1.12.patch:
+ Fix building with sys-devel/automake >= 1.12 wrt #420599 by Dennis Yxun
*lighttpd-1.4.31 (01 Jun 2012)
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.31-automake-1.12.patch b/www-servers/lighttpd/files/lighttpd-1.4.31-automake-1.12.patch
new file mode 100644
index 000000000000..eb3119fa01f7
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.31-automake-1.12.patch
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/420599
+
+--- configure.ac
++++ configure.ac
+@@ -14,6 +14,8 @@
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
+ dnl Checks for programs.
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
++
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_LD
+@@ -39,7 +41,6 @@
+ AC_EXEEXT
+
+ dnl more automake stuff
+-AM_C_PROTOTYPES
+
+ dnl libtool
+ AC_DISABLE_STATIC
diff --git a/www-servers/lighttpd/lighttpd-1.4.31.ebuild b/www-servers/lighttpd/lighttpd-1.4.31.ebuild
index 60b100418c0e..267d7d908501 100644
--- a/www-servers/lighttpd/lighttpd-1.4.31.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.31.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/www-servers/lighttpd/lighttpd-1.4.31.ebuild,v 1.1 2012/06/01 21:12:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.31.ebuild,v 1.2 2012/06/23 08:59:12 ssuominen Exp $
EAPI="4"
@@ -107,6 +107,7 @@ src_prepare() {
if use uploadprogress; then
epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch
fi
+ epatch "${FILESDIR}"/${P}-automake-1.12.patch
eautoreconf
}
src_configure() {