1 |
commit: 23e5561a2757175019959ef9a8ed5417238d3d8d |
2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 21 19:52:10 2015 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 21 19:52:31 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e5561a |
7 |
|
8 |
dev-util/emilpro: fix for new binutils and fix bug #553254 |
9 |
|
10 |
.../{emilpro-3-r1.ebuild => emilpro-3-r2.ebuild} | 11 +++- |
11 |
dev-util/emilpro/emilpro-9999.ebuild | 13 +++- |
12 |
.../files/emilpro-9999-use-gentoo-binutils.patch | 39 ++++++++++++ |
13 |
dev-util/emilpro/files/or1k-2.patch | 22 +++++++ |
14 |
dev-util/emilpro/files/or1k.patch | 70 ++++++++++++++++++++++ |
15 |
5 files changed, 150 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/emilpro/emilpro-3-r1.ebuild b/dev-util/emilpro/emilpro-3-r2.ebuild |
18 |
similarity index 83% |
19 |
rename from dev-util/emilpro/emilpro-3-r1.ebuild |
20 |
rename to dev-util/emilpro/emilpro-3-r2.ebuild |
21 |
index b5c741b..fb55946 100644 |
22 |
--- a/dev-util/emilpro/emilpro-3-r1.ebuild |
23 |
+++ b/dev-util/emilpro/emilpro-3-r2.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2014 Gentoo Foundation |
26 |
+# Copyright 1999-2015 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
# $Id$ |
29 |
|
30 |
@@ -28,7 +28,12 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf ) |
31 |
dev-cpp/gtkmm:3.0 |
32 |
dev-cpp/gtksourceviewmm:3.0 |
33 |
dev-cpp/libxmlpp:2.6 |
34 |
- system-binutils? ( sys-devel/binutils[multitarget] ) |
35 |
+ dev-cpp/glibmm |
36 |
+ dev-cpp/pangomm |
37 |
+ dev-cpp/cairomm |
38 |
+ dev-libs/libsigc++:2 |
39 |
+ dev-libs/glib:2 |
40 |
+ system-binutils? ( >=sys-devel/binutils-2.25.1-r1:*[multitarget] ) |
41 |
net-misc/curl" |
42 |
RDEPEND="${DEPEND}" |
43 |
|
44 |
@@ -39,6 +44,8 @@ src_prepare() { |
45 |
else |
46 |
sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake |
47 |
fi |
48 |
+ epatch "${FILESDIR}"/or1k.patch |
49 |
+ epatch "${FILESDIR}"/or1k-2.patch |
50 |
cmake-utils_src_prepare |
51 |
} |
52 |
|
53 |
|
54 |
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild |
55 |
index cba20f0..f91969c 100644 |
56 |
--- a/dev-util/emilpro/emilpro-9999.ebuild |
57 |
+++ b/dev-util/emilpro/emilpro-9999.ebuild |
58 |
@@ -1,4 +1,4 @@ |
59 |
-# Copyright 1999-2014 Gentoo Foundation |
60 |
+# Copyright 1999-2015 Gentoo Foundation |
61 |
# Distributed under the terms of the GNU General Public License v2 |
62 |
# $Id$ |
63 |
|
64 |
@@ -28,13 +28,20 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf ) |
65 |
dev-cpp/gtkmm:3.0 |
66 |
dev-cpp/gtksourceviewmm:3.0 |
67 |
dev-cpp/libxmlpp:2.6 |
68 |
- system-binutils? ( sys-devel/binutils[multitarget] ) |
69 |
+ dev-cpp/glibmm |
70 |
+ dev-cpp/pangomm |
71 |
+ dev-cpp/cairomm |
72 |
+ dev-libs/libsigc++:2 |
73 |
+ dev-libs/glib:2 |
74 |
+ system-binutils? ( >=sys-devel/binutils-2.25.1-r1:*[multitarget] ) |
75 |
net-misc/curl" |
76 |
+# automagic dep |
77 |
+# dev-util/capstone |
78 |
RDEPEND="${DEPEND}" |
79 |
|
80 |
src_prepare() { |
81 |
if use system-binutils; then |
82 |
- epatch "${FILESDIR}"/use-gentoo-binutils.patch |
83 |
+ epatch "${FILESDIR}"/${P}-use-gentoo-binutils.patch |
84 |
else |
85 |
sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake |
86 |
fi |
87 |
|
88 |
diff --git a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch |
89 |
new file mode 100644 |
90 |
index 0000000..8cfa9f5 |
91 |
--- /dev/null |
92 |
+++ b/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch |
93 |
@@ -0,0 +1,39 @@ |
94 |
+--- CMakeLists.txt.orig 2015-06-25 22:02:55.041406946 +0200 |
95 |
++++ CMakeLists.txt 2015-06-25 22:03:51.841696845 +0200 |
96 |
+@@ -11,7 +11,6 @@ |
97 |
+ set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
98 |
+ |
99 |
+ # Dependencies |
100 |
+-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake) |
101 |
+ |
102 |
+ find_package (LibElf REQUIRED) |
103 |
+ find_package (PkgConfig REQUIRED) |
104 |
+@@ -30,10 +29,6 @@ |
105 |
+ pkg_check_modules(LIBCURL REQUIRED libcurl) |
106 |
+ |
107 |
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread") |
108 |
+-LINK_DIRECTORIES( |
109 |
+- ${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64 |
110 |
+- ${CMAKE_BINARY_DIR}/binutils/libiberty |
111 |
+- ) |
112 |
+ |
113 |
+ if (HAVE_BFD_MULTIARCH) |
114 |
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH") |
115 |
+@@ -109,7 +104,6 @@ |
116 |
+ set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh) |
117 |
+ |
118 |
+ include_directories( |
119 |
+- ${CMAKE_BINARY_DIR}/install-binutils/include/ |
120 |
+ src/gtk/include/ |
121 |
+ src/include/ |
122 |
+ ${CMAKE_BINARY_DIR} |
123 |
+@@ -131,9 +125,6 @@ |
124 |
+ tools/squash-instruction-models.cc |
125 |
+ ) |
126 |
+ |
127 |
+-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils) |
128 |
+-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils) |
129 |
+- |
130 |
+ set (BASE_LIBS |
131 |
+ ${LIBELF_LIBRARIES} |
132 |
+ opcodes |
133 |
|
134 |
diff --git a/dev-util/emilpro/files/or1k-2.patch b/dev-util/emilpro/files/or1k-2.patch |
135 |
new file mode 100644 |
136 |
index 0000000..9dd4e19 |
137 |
--- /dev/null |
138 |
+++ b/dev-util/emilpro/files/or1k-2.patch |
139 |
@@ -0,0 +1,22 @@ |
140 |
+From 5b41e51bfb9fdeac7c6a2441badf8c3b92463fef Mon Sep 17 00:00:00 2001 |
141 |
+From: Alex Chernetz <andy80586@×××××.com> |
142 |
+Date: Fri, 1 May 2015 14:34:31 -0700 |
143 |
+Subject: [PATCH] Function is print_insn_or1k, not print_insn_little_or1k |
144 |
+ |
145 |
+--- |
146 |
+ src/bfd-disassembly.cc | 2 +- |
147 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
148 |
+ |
149 |
+diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc |
150 |
+index bf3e768..eeecbe4 100644 |
151 |
+--- a/src/bfd-disassembly.cc |
152 |
++++ b/src/bfd-disassembly.cc |
153 |
+@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly, |
154 |
+ m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k); /* Motorola 68xxx */ |
155 |
+ m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax); /* DEC Vax */ |
156 |
+ m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960); /* Intel 960 */ |
157 |
+- m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k); /* OpenRISC 32 */ |
158 |
++ m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_or1k); /* OpenRISC 32 */ |
159 |
+ m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc); /* SPARC */ |
160 |
+ m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu); /* PowerPC SPU */ |
161 |
+ m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860); /* Intel 860 */ |
162 |
|
163 |
diff --git a/dev-util/emilpro/files/or1k.patch b/dev-util/emilpro/files/or1k.patch |
164 |
new file mode 100644 |
165 |
index 0000000..e7a4392 |
166 |
--- /dev/null |
167 |
+++ b/dev-util/emilpro/files/or1k.patch |
168 |
@@ -0,0 +1,70 @@ |
169 |
+From f59c5f424a268313c1fcc009fd1e40c00bf6c4f2 Mon Sep 17 00:00:00 2001 |
170 |
+From: Alex Chernetz <andy80586@×××××.com> |
171 |
+Date: Fri, 1 May 2015 13:32:27 -0700 |
172 |
+Subject: [PATCH] or32 and openrisc architectures are replaced by or1k in |
173 |
+ current binutils |
174 |
+ |
175 |
+--- |
176 |
+ src/architecturefactory.cc | 6 ++---- |
177 |
+ src/bfd-disassembly.cc | 3 +-- |
178 |
+ 2 files changed, 3 insertions(+), 6 deletions(-) |
179 |
+ |
180 |
+diff --git a/src/architecturefactory.cc b/src/architecturefactory.cc |
181 |
+index 709b770..25ccf80 100644 |
182 |
+--- a/src/architecturefactory.cc |
183 |
++++ b/src/architecturefactory.cc |
184 |
+@@ -10,7 +10,7 @@ ArchitectureFactory::ArchitectureFactory() : |
185 |
+ m_architectureNameMap[(unsigned)bfd_arch_m68k] = "m68k"; |
186 |
+ m_architectureNameMap[(unsigned)bfd_arch_vax] = "vax"; |
187 |
+ m_architectureNameMap[(unsigned)bfd_arch_i960] = "i960"; |
188 |
+- m_architectureNameMap[(unsigned)bfd_arch_or32] = "or32"; |
189 |
++ m_architectureNameMap[(unsigned)bfd_arch_or1k] = "or1k"; |
190 |
+ m_architectureNameMap[(unsigned)bfd_arch_sparc] = "sparc"; |
191 |
+ m_architectureNameMap[(unsigned)bfd_arch_mips] = "mips"; |
192 |
+ m_architectureNameMap[(unsigned)bfd_arch_i386] = "i386"; |
193 |
+@@ -68,7 +68,6 @@ ArchitectureFactory::ArchitectureFactory() : |
194 |
+ m_architectureNameMap[(unsigned)bfd_arch_cris] = "cris"; |
195 |
+ m_architectureNameMap[(unsigned)bfd_arch_s390] = "s390"; |
196 |
+ m_architectureNameMap[(unsigned)bfd_arch_score] = "score"; |
197 |
+- m_architectureNameMap[(unsigned)bfd_arch_openrisc] = "openrisc"; |
198 |
+ m_architectureNameMap[(unsigned)bfd_arch_mmix] = "mmix"; |
199 |
+ m_architectureNameMap[(unsigned)bfd_arch_xstormy16] = "xstormy16"; |
200 |
+ m_architectureNameMap[(unsigned)bfd_arch_xc16x] = "xc16x"; |
201 |
+@@ -81,7 +80,7 @@ ArchitectureFactory::ArchitectureFactory() : |
202 |
+ m_nameArchitectureMap["m68k"] = (unsigned)bfd_arch_m68k; |
203 |
+ m_nameArchitectureMap["vax"] = (unsigned)bfd_arch_vax; |
204 |
+ m_nameArchitectureMap["i960"] = (unsigned)bfd_arch_i960; |
205 |
+- m_nameArchitectureMap["or32"] = (unsigned)bfd_arch_or32; |
206 |
++ m_nameArchitectureMap["or1k"] = (unsigned)bfd_arch_or1k; |
207 |
+ m_nameArchitectureMap["sparc"] = (unsigned)bfd_arch_sparc; |
208 |
+ m_nameArchitectureMap["mips"] = (unsigned)bfd_arch_mips; |
209 |
+ m_nameArchitectureMap["i386"] = (unsigned)bfd_arch_i386; |
210 |
+@@ -139,7 +138,6 @@ ArchitectureFactory::ArchitectureFactory() : |
211 |
+ m_nameArchitectureMap["cris"] = (unsigned)bfd_arch_cris; |
212 |
+ m_nameArchitectureMap["s390"] = (unsigned)bfd_arch_s390; |
213 |
+ m_nameArchitectureMap["score"] = (unsigned)bfd_arch_score; |
214 |
+- m_nameArchitectureMap["openrisc"] = (unsigned)bfd_arch_openrisc; |
215 |
+ m_nameArchitectureMap["mmix"] = (unsigned)bfd_arch_mmix; |
216 |
+ m_nameArchitectureMap["xstormy16"] = (unsigned)bfd_arch_xstormy16; |
217 |
+ m_nameArchitectureMap["xc16x"] = (unsigned)bfd_arch_xc16x; |
218 |
+diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc |
219 |
+index 5cda9e2..bf3e768 100644 |
220 |
+--- a/src/bfd-disassembly.cc |
221 |
++++ b/src/bfd-disassembly.cc |
222 |
+@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly, |
223 |
+ m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k); /* Motorola 68xxx */ |
224 |
+ m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax); /* DEC Vax */ |
225 |
+ m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960); /* Intel 960 */ |
226 |
+- m_arch[bfd_arch_or32] = BfdArch(bfd_arch_or32, 0, print_insn_little_or32); /* OpenRISC 32 */ |
227 |
++ m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k); /* OpenRISC 32 */ |
228 |
+ m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc); /* SPARC */ |
229 |
+ m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu); /* PowerPC SPU */ |
230 |
+ m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860); /* Intel 860 */ |
231 |
+@@ -89,7 +89,6 @@ class Disassembly : public IDisassembly, |
232 |
+ m_arch[bfd_arch_rl78] = BfdArch(bfd_arch_rl78, 0, print_insn_rl78); |
233 |
+ m_arch[bfd_arch_rx] = BfdArch(bfd_arch_rx, 0, print_insn_rx); /* Renesas RX. */ |
234 |
+ m_arch[bfd_arch_s390] = BfdArch(bfd_arch_s390, bfd_mach_s390_64, print_insn_s390); /* IBM s390 */ |
235 |
+- m_arch[bfd_arch_openrisc] = BfdArch(bfd_arch_openrisc, 0, print_insn_openrisc); /* OpenRISC */ |
236 |
+ m_arch[bfd_arch_mmix] = BfdArch(bfd_arch_mmix, 0, print_insn_mmix); /* Donald Knuth's educational processor. */ |
237 |
+ m_arch[bfd_arch_xstormy16] = BfdArch(bfd_arch_xstormy16, 0, print_insn_xstormy16); |
238 |
+ m_arch[bfd_arch_msp430] = BfdArch(bfd_arch_msp430, 0, print_insn_msp430); /* Texas Instruments MSP430 architecture. */ |