diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-10-26 21:48:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-10-26 21:48:26 +0000 |
| commit | 52c3360eed255a015426f8b2bd91e3ce3404e8ef (patch) | |
| tree | ff87286d751ec45fb6074483318c7411a02cd5df /net-firewall | |
| parent | Use python_{en,dis}able_pyc. (diff) | |
| download | gentoo-2-52c3360eed255a015426f8b2bd91e3ce3404e8ef.tar.gz gentoo-2-52c3360eed255a015426f8b2bd91e3ce3404e8ef.tar.bz2 gentoo-2-52c3360eed255a015426f8b2bd91e3ce3404e8ef.zip | |
Do not run ldconfig when installing.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/iptables/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch | 15 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.4.2-r1.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog index 2f2ed1c1ed20..2775e8fbd613 100644 --- a/net-firewall/iptables/ChangeLog +++ b/net-firewall/iptables/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/iptables # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.180 2008/10/26 21:39:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.181 2008/10/26 21:48:25 vapier Exp $ + + 26 Oct 2008; Mike Frysinger <vapier@gentoo.org> + +files/iptables-1.4.2-no-ldconfig.patch, iptables-1.4.2-r1.ebuild: + Do not run ldconfig when installing. *iptables-1.4.2-r1 (26 Oct 2008) diff --git a/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch b/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch new file mode 100644 index 000000000000..06a3be51b90d --- /dev/null +++ b/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch @@ -0,0 +1,15 @@ +avoid pointless overhead for DESTDIR builds + +http://bugzilla.netfilter.org/show_bug.cgi?id=560 + +--- Makefile.in ++++ Makefile.in +@@ -1530,7 +1530,7 @@ + # ldconfig may fail when we are not root (as is the case in build systems) + # so add appropriate protection that it does not let `make` fail. + install-exec-hook: +- -/sbin/ldconfig || :; ++ -[ -z "$(DESTDIR)" ] && /sbin/ldconfig + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/net-firewall/iptables/iptables-1.4.2-r1.ebuild b/net-firewall/iptables/iptables-1.4.2-r1.ebuild index c769e08268d5..545d7b26dc8d 100644 --- a/net-firewall/iptables/iptables-1.4.2-r1.ebuild +++ b/net-firewall/iptables/iptables-1.4.2-r1.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/net-firewall/iptables/iptables-1.4.2-r1.ebuild,v 1.1 2008/10/26 21:39:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r1.ebuild,v 1.2 2008/10/26 21:48:25 vapier Exp $ inherit eutils toolchain-funcs linux-info @@ -20,6 +20,7 @@ src_unpack() { unpack ${P}.tar.bz2 cd "${S}" epatch "${FILESDIR}"/${P}-glibc.patch + epatch "${FILESDIR}"/${P}-no-ldconfig.patch epatch "${FILESDIR}"/${P}-as-needed.patch #244431 local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches |