diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-04-22 10:57:38 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-04-22 10:57:38 +0000 |
| commit | 79f45fd6f3b72c2ee8d32994bf2ebcca73954a18 (patch) | |
| tree | 31a43369868867f3498f21e499cdb64efeff6112 /sys-devel | |
| parent | Added two patches from e-tobi. This should fix some segfaults, and add vdr-1.... (diff) | |
| download | gentoo-2-79f45fd6f3b72c2ee8d32994bf2ebcca73954a18.tar.gz gentoo-2-79f45fd6f3b72c2ee8d32994bf2ebcca73954a18.tar.bz2 gentoo-2-79f45fd6f3b72c2ee8d32994bf2ebcca73954a18.zip | |
Fix building with autoconf 2.62 (error in AC_HELP_STRING parameters), closes bug #218237. Also install documentation in the canonical directory, closes bug #179586.
(Portage version: 2.1.5_rc5)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/distcc/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-devel/distcc/distcc-2.18.3-r12.ebuild | 7 | ||||
| -rw-r--r-- | sys-devel/distcc/files/distcc-avahi-configure.patch | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index a4c4d6866c11..935bf11f560d 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/distcc # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.170 2008/02/18 00:32:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.171 2008/04/22 10:57:37 flameeyes Exp $ + + 22 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> + files/distcc-avahi-configure.patch, distcc-2.18.3-r12.ebuild: + Fix building with autoconf 2.62 (error in AC_HELP_STRING parameters), + closes bug #218237. Also install documentation in the canonical directory, + closes bug #179586. 17 Feb 2008; Alexis Ballier <aballier@gentoo.org> distcc-2.18.3-r12.ebuild: diff --git a/sys-devel/distcc/distcc-2.18.3-r12.ebuild b/sys-devel/distcc/distcc-2.18.3-r12.ebuild index b948b1cbfd9e..5d75a62febc3 100644 --- a/sys-devel/distcc/distcc-2.18.3-r12.ebuild +++ b/sys-devel/distcc/distcc-2.18.3-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r12.ebuild,v 1.2 2008/02/18 00:32:04 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r12.ebuild,v 1.3 2008/04/22 10:57:37 flameeyes Exp $ # If you change this in any way please email lisa@gentoo.org and make an # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye @@ -73,7 +73,7 @@ src_unpack() { } src_compile() { - local myconf="--without-included-popt " + local myconf="--without-included-popt --docdir=/usr/share/doc/${PF}" #More legacy stuff? [ `gcc-major-version` -eq 2 ] && filter-lfs-flags @@ -98,8 +98,7 @@ handle_avahi() { src_install() { make DESTDIR="${D%/}" install - insinto /usr/share/doc/${PN} - doins "${S}/survey.txt" + dodoc "${S}/survey.txt" exeinto /usr/bin doexe "${FILESDIR}/distcc-config" diff --git a/sys-devel/distcc/files/distcc-avahi-configure.patch b/sys-devel/distcc/files/distcc-avahi-configure.patch index 9f42764f2845..cc1097d643d1 100644 --- a/sys-devel/distcc/files/distcc-avahi-configure.patch +++ b/sys-devel/distcc/files/distcc-avahi-configure.patch @@ -5,7 +5,7 @@ diff -ur distcc-2.18.3.old/configure.ac distcc-2.18.3/configure.ac [#include <sys/socket.h>]) dnl check for avahi -+AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support], [], [enable_avahi=auto])) ++AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support]), [], [enable_avahi=auto]) +ZEROCONF_DISTCC_OBJS="" +ZEROCONF_DISTCCD_OBJS="" PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5], |