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][ 2/8] dev-libs/expat: Fix ppc64le configure problem
Date: Tue, 19 Apr 2016 14:14:52
Message-Id: 1461075186-13641-2-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 dev-libs/expat/expat-2.1.0-r5.ebuild | 1 +
3 .../files/expat-2.1.0-configure-with-ppc64le.patch | 78 ++++++++++++++++++++++
4 2 files changed, 79 insertions(+)
5 create mode 100644 dev-libs/expat/files/expat-2.1.0-configure-with-ppc64le.patch
6
7 diff --git a/dev-libs/expat/expat-2.1.0-r5.ebuild b/dev-libs/expat/expat-2.1.0-r5.ebuild
8 index c0aca16..bb3d559 100644
9 --- a/dev-libs/expat/expat-2.1.0-r5.ebuild
10 +++ b/dev-libs/expat/expat-2.1.0-r5.ebuild
11 @@ -19,6 +19,7 @@ RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
12 src_prepare() {
13 epatch "${FILESDIR}"/${P}-xmlwfargs.patch
14 epatch "${FILESDIR}"/${P}-mozilla-sanity-check-size.patch #555642
15 + epatch "${FILESDIR}"/${P}-configure-with-ppc64le.patch
16 elibtoolize
17 }
18
19 diff --git a/dev-libs/expat/files/expat-2.1.0-configure-with-ppc64le.patch b/dev-libs/expat/files/expat-2.1.0-configure-with-ppc64le.patch
20 new file mode 100644
21 index 0000000..2d7f01e
22 --- /dev/null
23 +++ b/dev-libs/expat/files/expat-2.1.0-configure-with-ppc64le.patch
24 @@ -0,0 +1,78 @@
25 +--- configure.orig 2016-04-13 16:49:24.906810546 +0000
26 ++++ configure 2016-04-13 16:52:37.792699936 +0000
27 +@@ -5932,6 +5932,9 @@
28 + ppc64-*linux*|powerpc64-*linux*)
29 + LD="${LD-ld} -m elf32ppclinux"
30 + ;;
31 ++ ppc64le-*linux*|powerpc64le-*linux*)
32 ++ LD="${LD-ld} -m elf32lppclinux"
33 ++ ;;
34 + s390x-*linux*)
35 + LD="${LD-ld} -m elf_s390"
36 + ;;
37 +@@ -5948,9 +5951,12 @@
38 + x86_64-*linux*)
39 + LD="${LD-ld} -m elf_x86_64"
40 + ;;
41 +- ppc*-*linux*|powerpc*-*linux*)
42 ++ ppc64-*linux*|powerpc64-*linux*)
43 + LD="${LD-ld} -m elf64ppc"
44 + ;;
45 ++ ppc64le-*linux*|powerpc64le-*linux*)
46 ++ LD="${LD-ld} -m elf64lppc"
47 ++ ;;
48 + s390*-*linux*|s390*-*tpf*)
49 + LD="${LD-ld} -m elf64_s390"
50 + ;;
51 +--- aclocal.m4.orig 2016-04-13 16:53:39.097309462 +0000
52 ++++ aclocal.m4 2016-04-13 16:55:33.502456982 +0000
53 +@@ -1292,6 +1292,9 @@
54 + ppc64-*linux*|powerpc64-*linux*)
55 + LD="${LD-ld} -m elf32ppclinux"
56 + ;;
57 ++ ppc64le-*linux*|powerpc64le-*linux*)
58 ++ LD="${LD-ld} -m elf32lppclinux"
59 ++ ;;
60 + s390x-*linux*)
61 + LD="${LD-ld} -m elf_s390"
62 + ;;
63 +@@ -1308,9 +1311,12 @@
64 + x86_64-*linux*)
65 + LD="${LD-ld} -m elf_x86_64"
66 + ;;
67 +- ppc*-*linux*|powerpc*-*linux*)
68 ++ ppc64-*linux*|powerpc64-*linux*)
69 + LD="${LD-ld} -m elf64ppc"
70 + ;;
71 ++ ppc64le-*linux*|powerpc64le-*linux*)
72 ++ LD="${LD-ld} -m elf64lppc"
73 ++ ;;
74 + s390*-*linux*|s390*-*tpf*)
75 + LD="${LD-ld} -m elf64_s390"
76 + ;;
77 +--- m4/libtool.m4.org 2016-04-13 16:58:32.884276527 +0000
78 ++++ m4/libtool.m4 2016-04-13 16:59:47.713041421 +0000
79 +@@ -1285,6 +1285,9 @@
80 + ppc64-*linux*|powerpc64-*linux*)
81 + LD="${LD-ld} -m elf32ppclinux"
82 + ;;
83 ++ ppc64le-*linux*|powerpc64le-*linux*)
84 ++ LD="${LD-ld} -m elf32lppclinux"
85 ++ ;;
86 + s390x-*linux*)
87 + LD="${LD-ld} -m elf_s390"
88 + ;;
89 +@@ -1301,9 +1304,12 @@
90 + x86_64-*linux*)
91 + LD="${LD-ld} -m elf_x86_64"
92 + ;;
93 +- ppc*-*linux*|powerpc*-*linux*)
94 ++ ppc64-*linux*|powerpc64-*linux*)
95 + LD="${LD-ld} -m elf64ppc"
96 + ;;
97 ++ ppc64le-*linux*|powerpc64le-*linux*)
98 ++ LD="${LD-ld} -m elf64lppc"
99 ++ ;;
100 + s390*-*linux*|s390*-*tpf*)
101 + LD="${LD-ld} -m elf64_s390"
102 + ;;
103 --
104 1.9.1