1 |
commit: dff2344c0d176d53d51fdab7af6897ff4a059c17 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Feb 24 18:51:40 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Fri Feb 24 18:51:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=dff2344c |
7 |
|
8 |
dev-util/systemtap: clean up patch |
9 |
|
10 |
dev-util/systemtap/Manifest | 4 +- |
11 |
dev-util/systemtap/files/systemtap-2.9-musl.patch | 114 +++++++++++----------- |
12 |
dev-util/systemtap/systemtap-2.9.ebuild | 4 +- |
13 |
3 files changed, 59 insertions(+), 63 deletions(-) |
14 |
|
15 |
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest |
16 |
index 57c6fb4..e6d6fd9 100644 |
17 |
--- a/dev-util/systemtap/Manifest |
18 |
+++ b/dev-util/systemtap/Manifest |
19 |
@@ -1,4 +1,4 @@ |
20 |
-AUX systemtap-2.9-musl.patch 6271 SHA256 422497a92cda46722684a24385cd70a5481bc98f512c2eff45b1bd7bf7567138 SHA512 517efd2df46d6a99e07361ccfeece74bb0192194061c824328377f5618c0349a037c888e3cf8dd0738896b127d296aacb7c21fbdca4209301f9ba090d28c97b3 WHIRLPOOL cfea1024590bcefe5c1124ad8dd8c9c379fc18026a30f7962f3bd6e4d64365c5d3ef7b862af0fc849514d24e061702babd47ed326b5b0b094f38a6801d959703 |
21 |
+AUX systemtap-2.9-musl.patch 5996 SHA256 d7ee1720b3872153d5aad22e10149665997b83395b87a6bf591e76a99b63c657 SHA512 e6ed2cc7f4cea4fd1ca3ed0ad02a65ccc1a839f566d5f27b94c72c84c3ebde59c651a8973bf41ea121459851b81a53682599d9cd91652efe244579d380d56030 WHIRLPOOL 1d65b80d2f1fce8cd1df600ea9c42a4e69830bb8e8b31ec026c329c7707f9231c2a05046b8ae6deea72839b322b5f6c8feea07306563ac6f33c88315be3aaba1 |
22 |
DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc WHIRLPOOL fa8d3978f0768091c5cc3bd1cd4b13b6ff9643e2e37ee8e8b59c1801fd7ddcad7029d06e4a1207dc5add5faf423de9ccdb9df677b7db88a5199b1fde731fcb3a |
23 |
-EBUILD systemtap-2.9.ebuild 2141 SHA256 b6b66f98e01762f427b1934a6db85401665114b5e8ff51931c67d566b6b4f131 SHA512 f7833c45851fd70c774ad0559394dc0e4baad27154ff7aee2ac3c58e7326c5aae98c1c2b14a0c41b37aa2fc3437fae3d3f9dc857795cdc8377cde86bdc88f554 WHIRLPOOL 8d2d5353089f8c2c889587e77d4d418b25d1f1ddd73c616c4e47ef1cb3f52d2d717c498fe018da541f9e46498e58b91c93aca9223dab92439036fd34d320f4c6 |
24 |
+EBUILD systemtap-2.9.ebuild 2148 SHA256 cdf2ae79cce60ff5ff2441be9ab9f3a62600edb2d71fec3c3758d7103f8c3ad6 SHA512 b682250e96d374cee0cf1891dd20d0d6414429b4a6213f79326cf4b8217e4a2100f64ad2b856a67973612ff0718cc72db271189a1fea9fed0f5a6c53e9a0b2cf WHIRLPOOL 08308b7ea364e05724ff3ca5cde2b4abc7c61cf705a6e83e3177268c8ef4010d0e19be5769aa8b7dfe24673b6a1fdc86631c92795f4b9f6bbc9a4a697ab4410f |
25 |
MISC metadata.xml 217 SHA256 9db437db95b71c3fcf9d45c3532ffb53c60b29a58c537dfe6c6d416d13b7cab5 SHA512 c677e2bf2d79d816a1be0e24c81fb40077680049b86f2691d7f88e652c8e3f9583d80f0bfb4c30ed3884160d18e497c6e3430b85d5c00ea92dd4801619e57590 WHIRLPOOL 312f5414c35807bc495126a66930517724a6a45f6b2ba4148fd4205ab41d0e5e8ef05746e373b25f7d1df7649d9b49f06a87f58f0d12d68a671260127b05d7b4 |
26 |
|
27 |
diff --git a/dev-util/systemtap/files/systemtap-2.9-musl.patch b/dev-util/systemtap/files/systemtap-2.9-musl.patch |
28 |
index 410e782..c90804f 100644 |
29 |
--- a/dev-util/systemtap/files/systemtap-2.9-musl.patch |
30 |
+++ b/dev-util/systemtap/files/systemtap-2.9-musl.patch |
31 |
@@ -1,6 +1,6 @@ |
32 |
-diff -Naurw systemtap-2.9.orig/buildrun.cxx systemtap-2.9/buildrun.cxx |
33 |
---- systemtap-2.9.orig/buildrun.cxx 2016-02-03 17:29:35.158854189 -0800 |
34 |
-+++ systemtap-2.9/buildrun.cxx 2016-02-03 17:29:45.349853899 -0800 |
35 |
+diff -Naur systemtap-2.9.orig/buildrun.cxx systemtap-2.9/buildrun.cxx |
36 |
+--- systemtap-2.9.orig/buildrun.cxx 2017-02-24 10:47:12.478787249 -0800 |
37 |
++++ systemtap-2.9/buildrun.cxx 2017-02-24 10:47:56.414162998 -0800 |
38 |
@@ -788,13 +788,14 @@ |
39 |
if (s.need_uprobes && !kernel_built_uprobes(s)) |
40 |
{ |
41 |
@@ -17,9 +17,9 @@ diff -Naurw systemtap-2.9.orig/buildrun.cxx systemtap-2.9/buildrun.cxx |
42 |
} |
43 |
staprun_cmd.push_back(opt_u); |
44 |
} |
45 |
-diff -Naurw systemtap-2.9.orig/configure.ac systemtap-2.9/configure.ac |
46 |
---- systemtap-2.9.orig/configure.ac 2016-02-03 17:29:35.161854189 -0800 |
47 |
-+++ systemtap-2.9/configure.ac 2016-02-03 17:45:48.771826500 -0800 |
48 |
+diff -Naur systemtap-2.9.orig/configure.ac systemtap-2.9/configure.ac |
49 |
+--- systemtap-2.9.orig/configure.ac 2017-02-24 10:47:12.480787266 -0800 |
50 |
++++ systemtap-2.9/configure.ac 2017-02-24 10:48:24.679405813 -0800 |
51 |
@@ -443,6 +443,50 @@ |
52 |
fi |
53 |
fi |
54 |
@@ -71,9 +71,9 @@ diff -Naurw systemtap-2.9.orig/configure.ac systemtap-2.9/configure.ac |
55 |
AC_SUBST(stap_LIBS) |
56 |
AC_MSG_NOTICE([stap will link $stap_LIBS]) |
57 |
|
58 |
-diff -Naurw systemtap-2.9.orig/csclient.cxx systemtap-2.9/csclient.cxx |
59 |
---- systemtap-2.9.orig/csclient.cxx 2016-02-03 17:29:35.161854189 -0800 |
60 |
-+++ systemtap-2.9/csclient.cxx 2016-02-03 17:29:45.353853899 -0800 |
61 |
+diff -Naur systemtap-2.9.orig/csclient.cxx systemtap-2.9/csclient.cxx |
62 |
+--- systemtap-2.9.orig/csclient.cxx 2017-02-24 10:47:12.481787274 -0800 |
63 |
++++ systemtap-2.9/csclient.cxx 2017-02-24 10:48:59.261702894 -0800 |
64 |
@@ -75,6 +75,10 @@ |
65 |
|
66 |
#define MOK_PUBLIC_CERT_NAME "signing_key.x509" |
67 |
@@ -94,43 +94,40 @@ diff -Naurw systemtap-2.9.orig/csclient.cxx systemtap-2.9/csclient.cxx |
68 |
if (! cpath) |
69 |
{ |
70 |
// It can not be canonicalized. Use the name relative to |
71 |
-diff -Naurw systemtap-2.9.orig/loc2c-test.c systemtap-2.9/loc2c-test.c |
72 |
---- systemtap-2.9.orig/loc2c-test.c 2016-02-03 17:29:35.222854187 -0800 |
73 |
-+++ systemtap-2.9/loc2c-test.c 2016-02-03 17:29:45.354853899 -0800 |
74 |
-@@ -11,7 +11,8 @@ |
75 |
- #include <stdio_ext.h> |
76 |
- #include <stdlib.h> |
77 |
- #include <string.h> |
78 |
--#include <error.h> |
79 |
-+#include <err.h> |
80 |
-+#define error err |
81 |
- #if ENABLE_NLS |
82 |
- #include <locale.h> |
83 |
- #endif |
84 |
-@@ -519,7 +520,7 @@ |
85 |
- } |
86 |
- else |
87 |
- { |
88 |
-- error (2, 0, "Error, dwarf_entry_breakpoints returned an error( %s )\n", |
89 |
-+ error (2, 0, "Error, dwarf_entry_breakpoints returned an err( %s )\n", |
90 |
- dwarf_errmsg (result)); |
91 |
- } |
92 |
- } |
93 |
-diff -Naurw systemtap-2.9.orig/loc2c.c systemtap-2.9/loc2c.c |
94 |
---- systemtap-2.9.orig/loc2c.c 2016-02-03 17:29:35.222854187 -0800 |
95 |
-+++ systemtap-2.9/loc2c.c 2016-02-03 17:51:01.664817602 -0800 |
96 |
-@@ -12,7 +12,7 @@ |
97 |
- #include <obstack.h> |
98 |
- #include <stdio.h> |
99 |
- #include <stdlib.h> |
100 |
--#include <error.h> |
101 |
-+#include <err.h> |
102 |
- #include <dwarf.h> |
103 |
- #include <elfutils/libdw.h> |
104 |
- #include <elfutils/version.h> |
105 |
-diff -Naurw systemtap-2.9.orig/remote.cxx systemtap-2.9/remote.cxx |
106 |
---- systemtap-2.9.orig/remote.cxx 2016-02-03 17:29:35.239854186 -0800 |
107 |
-+++ systemtap-2.9/remote.cxx 2016-02-03 17:29:45.359853899 -0800 |
108 |
+diff -Naur systemtap-2.9.orig/error.h systemtap-2.9/error.h |
109 |
+--- systemtap-2.9.orig/error.h 1969-12-31 16:00:00.000000000 -0800 |
110 |
++++ systemtap-2.9/error.h 2017-02-24 10:49:03.823742085 -0800 |
111 |
+@@ -0,0 +1,27 @@ |
112 |
++#ifndef _ERROR_H_ |
113 |
++#define _ERROR_H_ |
114 |
++ |
115 |
++#include <stdarg.h> |
116 |
++#include <stdio.h> |
117 |
++#include <stdlib.h> |
118 |
++#include <string.h> |
119 |
++#include <errno.h> |
120 |
++ |
121 |
++static unsigned int error_message_count = 0; |
122 |
++ |
123 |
++static inline void error(int status, int errnum, const char* format, ...) |
124 |
++{ |
125 |
++ va_list ap; |
126 |
++ fprintf(stderr, "%s: ", program_invocation_name); |
127 |
++ va_start(ap, format); |
128 |
++ vfprintf(stderr, format, ap); |
129 |
++ va_end(ap); |
130 |
++ if (errnum) |
131 |
++ fprintf(stderr, ": %s", strerror(errnum)); |
132 |
++ fprintf(stderr, "\n"); |
133 |
++ error_message_count++; |
134 |
++ if (status) |
135 |
++ exit(status); |
136 |
++} |
137 |
++ |
138 |
++#endif /* _ERROR_H_ */ |
139 |
+diff -Naur systemtap-2.9.orig/remote.cxx systemtap-2.9/remote.cxx |
140 |
+--- systemtap-2.9.orig/remote.cxx 2017-02-24 10:47:12.532787709 -0800 |
141 |
++++ systemtap-2.9/remote.cxx 2017-02-24 10:49:25.245926113 -0800 |
142 |
@@ -459,7 +459,8 @@ |
143 |
|
144 |
if (!s->uprobes_path.empty()) |
145 |
@@ -141,9 +138,9 @@ diff -Naurw systemtap-2.9.orig/remote.cxx systemtap-2.9/remote.cxx |
146 |
if ((rc = send_file(s->uprobes_path, remoteuprobes))) |
147 |
return rc; |
148 |
|
149 |
-diff -Naurw systemtap-2.9.orig/sdt_types.h systemtap-2.9/sdt_types.h |
150 |
---- systemtap-2.9.orig/sdt_types.h 2016-02-03 17:29:35.301854185 -0800 |
151 |
-+++ systemtap-2.9/sdt_types.h 2016-02-03 17:29:45.360853899 -0800 |
152 |
+diff -Naur systemtap-2.9.orig/sdt_types.h systemtap-2.9/sdt_types.h |
153 |
+--- systemtap-2.9.orig/sdt_types.h 2017-02-24 10:47:12.572788050 -0800 |
154 |
++++ systemtap-2.9/sdt_types.h 2017-02-24 10:49:42.865077472 -0800 |
155 |
@@ -10,6 +10,13 @@ |
156 |
#define UPROBE2_TYPE 0x32425055 /* "UPB2" */ |
157 |
#define UPROBE3_TYPE 0x33425055 /* "UPB3" */ |
158 |
@@ -158,9 +155,9 @@ diff -Naurw systemtap-2.9.orig/sdt_types.h systemtap-2.9/sdt_types.h |
159 |
typedef enum |
160 |
{ |
161 |
uprobe1_type = UPROBE1_TYPE, |
162 |
-diff -Naurw systemtap-2.9.orig/session.cxx systemtap-2.9/session.cxx |
163 |
---- systemtap-2.9.orig/session.cxx 2016-02-03 17:29:35.301854185 -0800 |
164 |
-+++ systemtap-2.9/session.cxx 2016-02-03 17:29:45.362853899 -0800 |
165 |
+diff -Naur systemtap-2.9.orig/session.cxx systemtap-2.9/session.cxx |
166 |
+--- systemtap-2.9.orig/session.cxx 2017-02-24 10:47:12.572788050 -0800 |
167 |
++++ systemtap-2.9/session.cxx 2017-02-24 10:49:56.716196203 -0800 |
168 |
@@ -1329,7 +1329,7 @@ |
169 |
cerr << "ERROR: multiple --sysroot options not supported" << endl; |
170 |
return 1; |
171 |
@@ -170,17 +167,16 @@ diff -Naurw systemtap-2.9.orig/session.cxx systemtap-2.9/session.cxx |
172 |
if (spath == NULL) { |
173 |
cerr << _F("ERROR: %s is an invalid directory for --sysroot", optarg) << endl; |
174 |
return 1; |
175 |
-diff -Naurw systemtap-2.9.orig/staprun/staprun.h systemtap-2.9/staprun/staprun.h |
176 |
---- systemtap-2.9.orig/staprun/staprun.h 2016-02-03 17:29:35.312854184 -0800 |
177 |
-+++ systemtap-2.9/staprun/staprun.h 2016-02-03 17:29:45.363853898 -0800 |
178 |
-@@ -48,6 +48,10 @@ |
179 |
+diff -Naur systemtap-2.9.orig/staprun/staprun.h systemtap-2.9/staprun/staprun.h |
180 |
+--- systemtap-2.9.orig/staprun/staprun.h 2017-02-24 10:47:12.581788127 -0800 |
181 |
++++ systemtap-2.9/staprun/staprun.h 2017-02-24 10:50:18.951386526 -0800 |
182 |
+@@ -47,6 +47,9 @@ |
183 |
+ #include <locale.h> |
184 |
#endif |
185 |
|
186 |
- |
187 |
+#ifndef __off_t |
188 |
+#define __off_t off_t |
189 |
+#endif |
190 |
-+ |
191 |
+ |
192 |
/* define gettext options if NLS is set */ |
193 |
#if ENABLE_NLS |
194 |
- #define _(string) gettext(string) |
195 |
|
196 |
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild |
197 |
index 5d676e3..e741ea3 100644 |
198 |
--- a/dev-util/systemtap/systemtap-2.9.ebuild |
199 |
+++ b/dev-util/systemtap/systemtap-2.9.ebuild |
200 |
@@ -1,4 +1,4 @@ |
201 |
-# Copyright 1999-2014 Gentoo Foundation |
202 |
+# Copyright 1999-2017 Gentoo Foundation |
203 |
# Distributed under the terms of the GNU General Public License v2 |
204 |
# $Id$ |
205 |
|
206 |
@@ -14,7 +14,7 @@ SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz" |
207 |
|
208 |
LICENSE="GPL-2" |
209 |
SLOT="0" |
210 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
211 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
212 |
IUSE="sqlite" |
213 |
|
214 |
RDEPEND=">=dev-libs/elfutils-0.142 |