diff options
| author |   Eray Aslan <eras@gentoo.org> | 2013-04-26 09:18:16 +0000 |
|---|---|---|
| committer | Eray Aslan <eras@gentoo.org> | 2013-04-26 09:18:16 +0000 |
| commit | 0e043a90df3abbb9ef45fb5cf845af20fbc02858 (patch) | |
| tree | a338a81065f3d425ce1e6269f3e5bb4fde4a6878 /net-proxy/squid | |
| parent | More better fix that actually works now (diff) | |
| download | gentoo-2-0e043a90df3abbb9ef45fb5cf845af20fbc02858.tar.gz gentoo-2-0e043a90df3abbb9ef45fb5cf845af20fbc02858.tar.bz2 gentoo-2-0e043a90df3abbb9ef45fb5cf845af20fbc02858.zip | |
Fix and work around build failures with automake-1.13
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)
Diffstat (limited to 'net-proxy/squid')
| -rw-r--r-- | net-proxy/squid/ChangeLog | 5 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.3.3-r1.ebuild | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index 89e20077cbff..833f740261e3 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-proxy/squid # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.407 2013/04/16 05:02:02 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.408 2013/04/26 09:18:16 eras Exp $ + + 26 Apr 2013; Eray Aslan <eras@gentoo.org> squid-3.3.3-r1.ebuild: + Fix and work around build failures with automake-1.13 *squid-3.3.3-r1 (16 Apr 2013) *squid-3.2.9-r1 (16 Apr 2013) diff --git a/net-proxy/squid/squid-3.3.3-r1.ebuild b/net-proxy/squid/squid-3.3.3-r1.ebuild index 13a7bfd44eac..8a3a605578b0 100644 --- a/net-proxy/squid/squid-3.3.3-r1.ebuild +++ b/net-proxy/squid/squid-3.3.3-r1.ebuild @@ -1,8 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild,v 1.1 2013/04/16 05:02:02 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.3-r1.ebuild,v 1.2 2013/04/26 09:18:16 eras Exp $ EAPI=5 + +# Workaround to avoid failing make check until we have a proper fix +WANT_AUTOMAKE="1.12" + inherit autotools eutils linux-info pam toolchain-funcs user versionator DESCRIPTION="A full-featured web proxy cache" @@ -61,6 +65,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch" epatch "${FILESDIR}/${PN}-3.3.3-ncsa_auth.patch" + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ + lib/libTrie/configure.ac || die sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ INSTALL QUICKSTART \ helpers/basic_auth/MSNT/README.html \ |