1 |
commit: b4c8e3713282b09a2703d5069c0ed3d856b5eb53 |
2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 29 18:38:59 2016 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 29 18:39:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c8e371 |
7 |
|
8 |
dev-util/emilpro: fix bug #561978 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
dev-util/emilpro/emilpro-3-r3.ebuild | 4 ++-- |
13 |
dev-util/emilpro/emilpro-9999.ebuild | 4 ++-- |
14 |
...utils.patch => emilpro-3-system-binutils.patch} | 18 +++++++++++++--- |
15 |
...ls.patch => emilpro-9999-system-binutils.patch} | 25 ++++++++++++++++------ |
16 |
4 files changed, 38 insertions(+), 13 deletions(-) |
17 |
|
18 |
diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r3.ebuild |
19 |
index 7447e4d..b6c73d1 100644 |
20 |
--- a/dev-util/emilpro/emilpro-3-r3.ebuild |
21 |
+++ b/dev-util/emilpro/emilpro-3-r3.ebuild |
22 |
@@ -33,14 +33,14 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf ) |
23 |
dev-cpp/cairomm |
24 |
dev-libs/libsigc++:2 |
25 |
dev-libs/glib:2 |
26 |
- system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] ) |
27 |
+ system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) |
28 |
net-misc/curl" |
29 |
RDEPEND="${DEPEND}" |
30 |
|
31 |
src_prepare() { |
32 |
epatch "${FILESDIR}"/respect-cflags.patch |
33 |
if use system-binutils; then |
34 |
- epatch "${FILESDIR}"/use-gentoo-binutils.patch |
35 |
+ epatch "${FILESDIR}"/${P}-system-binutils.patch |
36 |
else |
37 |
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 |
38 |
fi |
39 |
|
40 |
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild |
41 |
index dd7ff40..ccf564b 100644 |
42 |
--- a/dev-util/emilpro/emilpro-9999.ebuild |
43 |
+++ b/dev-util/emilpro/emilpro-9999.ebuild |
44 |
@@ -33,7 +33,7 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf ) |
45 |
dev-cpp/cairomm |
46 |
dev-libs/libsigc++:2 |
47 |
dev-libs/glib:2 |
48 |
- system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] ) |
49 |
+ system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) |
50 |
net-misc/curl" |
51 |
# automagic dep |
52 |
# dev-util/capstone |
53 |
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}" |
54 |
|
55 |
src_prepare() { |
56 |
if use system-binutils; then |
57 |
- epatch "${FILESDIR}"/${P}-use-gentoo-binutils.patch |
58 |
+ epatch "${FILESDIR}"/${P}-system-binutils.patch |
59 |
else |
60 |
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 |
61 |
fi |
62 |
|
63 |
diff --git a/dev-util/emilpro/files/use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-3-system-binutils.patch |
64 |
similarity index 65% |
65 |
rename from dev-util/emilpro/files/use-gentoo-binutils.patch |
66 |
rename to dev-util/emilpro/files/emilpro-3-system-binutils.patch |
67 |
index 5760558..d73f402 100644 |
68 |
--- a/dev-util/emilpro/files/use-gentoo-binutils.patch |
69 |
+++ b/dev-util/emilpro/files/emilpro-3-system-binutils.patch |
70 |
@@ -1,6 +1,6 @@ |
71 |
-diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt |
72 |
---- emilpro-3/CMakeLists.txt 2013-12-28 04:22:34.000000000 -0500 |
73 |
-+++ emilpro-3-nobinutils/CMakeLists.txt 2014-03-18 14:59:17.983479920 -0400 |
74 |
+diff -Naur emilpro-3-orig/CMakeLists.txt emilpro-3/CMakeLists.txt |
75 |
+--- emilpro-3-orig/CMakeLists.txt 2016-03-29 13:19:47.035441401 -0400 |
76 |
++++ emilpro-3/CMakeLists.txt 2016-03-29 13:18:36.650443067 -0400 |
77 |
@@ -11,7 +11,6 @@ |
78 |
set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
79 |
|
80 |
@@ -34,3 +34,15 @@ diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt |
81 |
|
82 |
set (BASE_LIBS |
83 |
${LIBELF_LIBRARIES} |
84 |
+diff -Naur emilpro-3-orig/src/namemangler.cc emilpro-3/src/namemangler.cc |
85 |
+--- emilpro-3-orig/src/namemangler.cc 2016-03-29 13:17:23.957444786 -0400 |
86 |
++++ emilpro-3/src/namemangler.cc 2016-03-29 13:18:57.306442578 -0400 |
87 |
+@@ -1,7 +1,7 @@ |
88 |
+ #include <namemangler.hh> |
89 |
+ |
90 |
+ #include <bfd.h> |
91 |
+-#include <demangle.h> |
92 |
++#include <libiberty/demangle.h> |
93 |
+ |
94 |
+ using namespace emilpro; |
95 |
+ |
96 |
|
97 |
diff --git a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch |
98 |
similarity index 61% |
99 |
rename from dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch |
100 |
rename to dev-util/emilpro/files/emilpro-9999-system-binutils.patch |
101 |
index 8cfa9f5..194e8d1 100644 |
102 |
--- a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch |
103 |
+++ b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch |
104 |
@@ -1,5 +1,6 @@ |
105 |
---- CMakeLists.txt.orig 2015-06-25 22:02:55.041406946 +0200 |
106 |
-+++ CMakeLists.txt 2015-06-25 22:03:51.841696845 +0200 |
107 |
+diff -Naur emilpro-9999-orig/CMakeLists.txt emilpro-9999/CMakeLists.txt |
108 |
+--- emilpro-9999-orig/CMakeLists.txt 2016-03-29 14:30:48.017340585 -0400 |
109 |
++++ emilpro-9999/CMakeLists.txt 2016-03-29 14:31:21.335339797 -0400 |
110 |
@@ -11,7 +11,6 @@ |
111 |
set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
112 |
|
113 |
@@ -7,8 +8,8 @@ |
114 |
-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake) |
115 |
|
116 |
find_package (LibElf REQUIRED) |
117 |
- find_package (PkgConfig REQUIRED) |
118 |
-@@ -30,10 +29,6 @@ |
119 |
+ find_package (LibCapstone) |
120 |
+@@ -40,10 +39,6 @@ |
121 |
pkg_check_modules(LIBCURL REQUIRED libcurl) |
122 |
|
123 |
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread") |
124 |
@@ -19,7 +20,7 @@ |
125 |
|
126 |
if (HAVE_BFD_MULTIARCH) |
127 |
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH") |
128 |
-@@ -109,7 +104,6 @@ |
129 |
+@@ -120,7 +115,6 @@ |
130 |
set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh) |
131 |
|
132 |
include_directories( |
133 |
@@ -27,7 +28,7 @@ |
134 |
src/gtk/include/ |
135 |
src/include/ |
136 |
${CMAKE_BINARY_DIR} |
137 |
-@@ -131,9 +125,6 @@ |
138 |
+@@ -143,9 +137,6 @@ |
139 |
tools/squash-instruction-models.cc |
140 |
) |
141 |
|
142 |
@@ -37,3 +38,15 @@ |
143 |
set (BASE_LIBS |
144 |
${LIBELF_LIBRARIES} |
145 |
opcodes |
146 |
+diff -Naur emilpro-9999-orig/src/namemangler.cc emilpro-9999/src/namemangler.cc |
147 |
+--- emilpro-9999-orig/src/namemangler.cc 2016-03-29 14:30:48.017340585 -0400 |
148 |
++++ emilpro-9999/src/namemangler.cc 2016-03-29 14:31:06.397340150 -0400 |
149 |
+@@ -1,7 +1,7 @@ |
150 |
+ #include <namemangler.hh> |
151 |
+ |
152 |
+ #include <bfd.h> |
153 |
+-#include <demangle.h> |
154 |
++#include <libiberty/demangle.h> |
155 |
+ |
156 |
+ using namespace emilpro; |
157 |
+ |