Gentoo Archives: gentoo-dev

From: Leno Hou <lenohou@×××××.com>
To: blueness@g.o, gentoo-dev@l.g.o
Cc: Leno Hou <lenohou@×××××.com>
Subject: [gentoo-dev] [PATCH v1][ 3/8] net-firewall/iptables: Fix ppc64le configure problem
Date: Tue, 19 Apr 2016 14:15:14
Message-Id: 1461075186-13641-3-git-send-email-lenohou@gmail.com
In Reply to: [gentoo-dev] [PATCH v1][ 1/8] app-text/opensp: Fix ppc64le configure problem by Leno Hou
1 ---
2 .../iptables-1.4.21-configure-with-ppc64le.patch | 26 ++++++++++++++++++++++
3 net-firewall/iptables/iptables-1.4.21-r1.ebuild | 3 +++
4 net-firewall/iptables/iptables-1.4.21-r2.ebuild | 2 ++
5 net-firewall/iptables/iptables-1.4.21-r3.ebuild | 2 ++
6 net-firewall/iptables/iptables-1.4.21-r4.ebuild | 1 +
7 5 files changed, 34 insertions(+)
8 create mode 100644 net-firewall/iptables/files/iptables-1.4.21-configure-with-ppc64le.patch
9
10 diff --git a/net-firewall/iptables/files/iptables-1.4.21-configure-with-ppc64le.patch b/net-firewall/iptables/files/iptables-1.4.21-configure-with-ppc64le.patch
11 new file mode 100644
12 index 0000000..58ebb6a
13 --- /dev/null
14 +++ b/net-firewall/iptables/files/iptables-1.4.21-configure-with-ppc64le.patch
15 @@ -0,0 +1,26 @@
16 +--- configure.orig 2016-04-08 14:03:11.035208027 -0400
17 ++++ configure 2016-04-08 14:05:22.270056952 -0400
18 +@@ -6707,6 +6707,9 @@
19 + ppc64-*linux*|powerpc64-*linux*)
20 + LD="${LD-ld} -m elf32ppclinux"
21 + ;;
22 ++ ppc64le-*linux*|powerpc64le-*linux*)
23 ++ LD="${LD-ld} -m elf32lppclinux"
24 ++ ;;
25 + s390x-*linux*)
26 + LD="${LD-ld} -m elf_s390"
27 + ;;
28 +@@ -6723,9 +6726,12 @@
29 + x86_64-*linux*)
30 + LD="${LD-ld} -m elf_x86_64"
31 + ;;
32 +- ppc*-*linux*|powerpc*-*linux*)
33 ++ ppc64-*linux*|powerpc64-*linux*)
34 + LD="${LD-ld} -m elf64ppc"
35 + ;;
36 ++ ppc64le-*linux*|powerpc64le-*linux*)
37 ++ LD="${LD-ld} -m elf64lppc"
38 ++ ;;
39 + s390*-*linux*|s390*-*tpf*)
40 + LD="${LD-ld} -m elf64_s390"
41 + ;;
42 diff --git a/net-firewall/iptables/iptables-1.4.21-r1.ebuild b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
43 index 056b1b4..288f2da 100644
44 --- a/net-firewall/iptables/iptables-1.4.21-r1.ebuild
45 +++ b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
46 @@ -31,6 +31,9 @@ src_prepare() {
47 # use the saner headers from the kernel
48 rm -f include/linux/{kernel,types}.h
49
50 + # fix the configure problem for ppc64le
51 + epatch "${FILESDIR}"/${P}-configure-with-ppc64le.patch
52 +
53 # Only run autotools if user patched something
54 epatch_user && eautoreconf || elibtoolize
55 }
56 diff --git a/net-firewall/iptables/iptables-1.4.21-r2.ebuild b/net-firewall/iptables/iptables-1.4.21-r2.ebuild
57 index e87e4ed..1baaf2d 100644
58 --- a/net-firewall/iptables/iptables-1.4.21-r2.ebuild
59 +++ b/net-firewall/iptables/iptables-1.4.21-r2.ebuild
60 @@ -35,6 +35,8 @@ src_prepare() {
61 rm -f include/linux/{kernel,types}.h
62
63 epatch "${FILESDIR}"/${P}-configure.patch #557586
64 + # fix the configure problem for ppc64le
65 + epatch "${FILESDIR}"/${P}-configure-with-ppc64le.patch
66
67 # Only run autotools if user patched something
68 epatch_user && eautoreconf || elibtoolize
69 diff --git a/net-firewall/iptables/iptables-1.4.21-r3.ebuild b/net-firewall/iptables/iptables-1.4.21-r3.ebuild
70 index ef4eb78..7eb801f 100644
71 --- a/net-firewall/iptables/iptables-1.4.21-r3.ebuild
72 +++ b/net-firewall/iptables/iptables-1.4.21-r3.ebuild
73 @@ -36,6 +36,8 @@ src_prepare() {
74
75 epatch "${FILESDIR}"/${P}-configure.patch #557586
76 epatch "${FILESDIR}"/${P}-static-connlabel-config.patch #558234
77 + epatch "${FILESDIR}"/${P}-configure-with-ppc64le.patch
78 +
79
80 # Only run autotools if user patched something
81 epatch_user && eautoreconf || elibtoolize
82 diff --git a/net-firewall/iptables/iptables-1.4.21-r4.ebuild b/net-firewall/iptables/iptables-1.4.21-r4.ebuild
83 index 49b9bd8..27c89fe 100644
84 --- a/net-firewall/iptables/iptables-1.4.21-r4.ebuild
85 +++ b/net-firewall/iptables/iptables-1.4.21-r4.ebuild
86 @@ -36,6 +36,7 @@ src_prepare() {
87
88 epatch "${FILESDIR}"/${P}-configure.patch #557586
89 epatch "${FILESDIR}"/${P}-static-connlabel-config.patch #558234
90 + epatch "${FILESDIR}"/${P}-configure-with-ppc64le.patch
91
92 # Only run autotools if user patched something
93 epatch_user && eautoreconf || elibtoolize
94 --
95 1.9.1