commit:     35a3bea74f790d3fd69cab4b40f245078dd6bf18
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 17:30:35 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 17:31:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a3bea7

net-firewall/iptables: use -fpack-struct w/x32 ABI #472388

Apply a hack for the x32 ABI to try to get it working.  The current
version is entirely broken, so this is still better than the status quo.

 net-firewall/iptables/iptables-1.4.21-r2.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-firewall/iptables/iptables-1.4.21-r2.ebuild 
b/net-firewall/iptables/iptables-1.4.21-r2.ebuild
index 268e0f7..e87e4ed 100644
--- a/net-firewall/iptables/iptables-1.4.21-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-r2.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 # Force users doing their own patches to install their own tools
 AUTOTOOLS_AUTO_DEPEND=no
 
-inherit eutils multilib systemd toolchain-funcs autotools
+inherit eutils multilib systemd toolchain-funcs autotools flag-o-matic
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="http://www.netfilter.org/projects/iptables/";
@@ -44,6 +44,9 @@ src_configure() {
        # Some libs use $(AR) rather than libtool to build #444282
        tc-export AR
 
+       # Hack around struct mismatches between userland & kernel for some 
ABIs. #472388
+       use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
+
        sed -i \
                -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
                -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \

Reply via email to