diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-05-29 17:06:15 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-05-29 17:06:15 +0000 |
| commit | 5ce17cec22851b37be69b48f035e5a9c08919e17 (patch) | |
| tree | 237d10059695484b003b51d1ca23844b4ee52a24 /net-firewall | |
| parent | sparc stable wrt #364865 (diff) | |
| download | gentoo-2-5ce17cec22851b37be69b48f035e5a9c08919e17.tar.gz gentoo-2-5ce17cec22851b37be69b48f035e5a9c08919e17.tar.bz2 gentoo-2-5ce17cec22851b37be69b48f035e5a9c08919e17.zip | |
Disable ccache and distcc autodetection, bug 346009
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/fwbuilder/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch | 35 | ||||
| -rw-r--r-- | net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild | 12 |
3 files changed, 48 insertions, 5 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog index 39e82e2b4951..77e81ab67060 100644 --- a/net-firewall/fwbuilder/ChangeLog +++ b/net-firewall/fwbuilder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/fwbuilder # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.102 2011/05/29 16:21:42 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.103 2011/05/29 17:06:15 dilfridge Exp $ + + 29 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> + fwbuilder-4.2.2.3541.ebuild, +files/fwbuilder-4.2.2.3541-ccache.patch: + Disable ccache and distcc autodetection, bug 346009 29 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> fwbuilder-3.0.7.ebuild: diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch new file mode 100644 index 000000000000..807d9ac488fa --- /dev/null +++ b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch @@ -0,0 +1,35 @@ +diff -ruN fwbuilder-4.2.2.3541.orig/configure.in fwbuilder-4.2.2.3541/configure.in +--- fwbuilder-4.2.2.3541.orig/configure.in 2011-05-11 23:02:03.000000000 +0200 ++++ fwbuilder-4.2.2.3541/configure.in 2011-05-29 18:53:06.624998022 +0200 +@@ -638,12 +638,27 @@ + AC_SUBST(MANDIR) + AC_SUBST(ICONSDIR) + +-AC_PATH_PROG(CCACHE, ccache, , ) +-AC_SUBST(CCACHE) ++AC_ARG_WITH(ccache,[ --with-ccache=yes Use ccache to speed up repeated compilation]) + +-if test -n "$CCACHE" +-then ++if test -n "$with_ccache"; then ++ if test "x$with_ccache" != "xno"; then ++ AC_PATH_PROG(CCACHE, ccache, , ) ++ AC_SUBST(CCACHE) ++ if test -n "$CCACHE" ++ then ++ ccache -s ++ fi ++ else ++ CCACHE="" ++ AC_SUBST(CCACHE) ++ fi ++else ++ AC_PATH_PROG(CCACHE, ccache, , ) ++ AC_SUBST(CCACHE) ++ if test -n "$CCACHE" ++ then + ccache -s ++ fi + fi + + AC_ARG_WITH(distcc,[ --with-distcc=N Use distcc with N parallel make count]) diff --git a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild index 837ae648b80b..8cc4b12d531a 100644 --- a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild +++ b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.1 2011/05/15 17:25:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.2 2011/05/29 17:06:15 dilfridge Exp $ EAPI=4 -inherit eutils qt4-r2 multilib autotools +inherit eutils base qt4-r2 multilib autotools DESCRIPTION="A firewall GUI" HOMEPAGE="http://www.fwbuilder.org/" @@ -21,9 +21,13 @@ DEPEND=">=x11-libs/qt-gui-4.3 !net-libs/libfwbuilder" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-ldflags.patch" + "${FILESDIR}/${P}-ccache.patch" +) + src_prepare() { qt4-r2_src_prepare - epatch "${FILESDIR}/${P}-ldflags.patch" eautoreconf # This package fundamentally changed its build system. We have to @@ -33,7 +37,7 @@ src_prepare() { } src_configure() { - econf + econf --with-ccache=no --with-distcc=no } src_install() { |