1 |
commit: cbc310b44cb1cca7dd68f70bf16dff3478f3d387 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 6 21:06:46 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 6 21:11:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc310b4 |
7 |
|
8 |
dev-util/strace: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-util/strace/Manifest | 1 - |
14 |
.../strace/files/strace-5.2-linux-5.3-compat.patch | 75 ----------------- |
15 |
dev-util/strace/strace-5.2.ebuild | 97 ---------------------- |
16 |
3 files changed, 173 deletions(-) |
17 |
|
18 |
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest |
19 |
index 920d075e810..1219d8b8409 100644 |
20 |
--- a/dev-util/strace/Manifest |
21 |
+++ b/dev-util/strace/Manifest |
22 |
@@ -1,5 +1,4 @@ |
23 |
DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290 |
24 |
-DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35 |
25 |
DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a |
26 |
DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7 |
27 |
DIST strace-5.5.tar.xz 1628744 BLAKE2B ae2ab9b2c756858c3c23640ee19821b8720da84a5e15e4a674768d8f4b51d74b2b490cfa18a862bc3c9d129baeaf09212700bea98ac151db035d03a05afa055d SHA512 317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231 |
28 |
|
29 |
diff --git a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch b/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch |
30 |
deleted file mode 100644 |
31 |
index 254326f0457..00000000000 |
32 |
--- a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch |
33 |
+++ /dev/null |
34 |
@@ -1,75 +0,0 @@ |
35 |
-https://github.com/strace/strace/commit/60da39553ff92cf741bf7f54daff636bb28cbb3c |
36 |
-https://bugs.gentoo.org/695260 |
37 |
- |
38 |
---- a/xlat/v4l2_pix_fmts.h |
39 |
-+++ b/xlat/v4l2_pix_fmts.h |
40 |
-@@ -269,19 +269,23 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE |
41 |
- #else |
42 |
- # define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') |
43 |
- #endif |
44 |
--#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444) |
45 |
-+#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12) |
46 |
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE |
47 |
--static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('B', 'A', '1', '2')"); |
48 |
-+static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')"); |
49 |
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE |
50 |
- #else |
51 |
--# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') |
52 |
-+# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') |
53 |
- #endif |
54 |
--#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12) |
55 |
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 |
56 |
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 |
57 |
-+# undef V4L2_PIX_FMT_BGRA444 |
58 |
-+#endif |
59 |
-+#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444) |
60 |
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE |
61 |
--static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')"); |
62 |
-+static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('G', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('G', 'A', '1', '2')"); |
63 |
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE |
64 |
- #else |
65 |
--# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') |
66 |
-+# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') |
67 |
- #endif |
68 |
- #if defined(V4L2_PIX_FMT_RGBA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_RGBA444) && HAVE_DECL_V4L2_PIX_FMT_RGBA444) |
69 |
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE |
70 |
-@@ -1343,8 +1347,17 @@ const struct xlat v4l2_pix_fmts[] = { |
71 |
- XLAT(V4L2_PIX_FMT_H264_NO_SC), |
72 |
- XLAT(V4L2_PIX_FMT_PWC1), |
73 |
- XLAT(V4L2_PIX_FMT_MPEG1), |
74 |
-- XLAT(V4L2_PIX_FMT_BGRA444), |
75 |
- XLAT(V4L2_PIX_FMT_SGRBG12), |
76 |
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 |
77 |
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 |
78 |
-+/* |
79 |
-+* V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with |
80 |
-+* the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit |
81 |
-+* v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12. |
82 |
-+*/ |
83 |
-+# undef V4L2_PIX_FMT_BGRA444 |
84 |
-+#endif |
85 |
-+ XLAT(V4L2_PIX_FMT_BGRA444), |
86 |
- XLAT(V4L2_PIX_FMT_RGBA444), |
87 |
- XLAT(V4L2_PIX_FMT_ABGR444), |
88 |
- XLAT(V4L2_PIX_FMT_SGBRG12), |
89 |
---- a/xlat/v4l2_pix_fmts.in |
90 |
-+++ b/xlat/v4l2_pix_fmts.in |
91 |
-@@ -37,8 +37,17 @@ V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2 */ |
92 |
- V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ |
93 |
- V4L2_PIX_FMT_PWC1 v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */ |
94 |
- V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ |
95 |
--V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ |
96 |
- V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */ |
97 |
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 |
98 |
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 |
99 |
-+/* |
100 |
-+ * V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with |
101 |
-+ * the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit |
102 |
-+ * v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12. |
103 |
-+ */ |
104 |
-+# undef V4L2_PIX_FMT_BGRA444 |
105 |
-+#endif |
106 |
-+V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ |
107 |
- V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16 rrrrgggg bbbbaaaa */ |
108 |
- V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16 aaaabbbb ggggrrrr */ |
109 |
- V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */ |
110 |
|
111 |
diff --git a/dev-util/strace/strace-5.2.ebuild b/dev-util/strace/strace-5.2.ebuild |
112 |
deleted file mode 100644 |
113 |
index 88a2db590c1..00000000000 |
114 |
--- a/dev-util/strace/strace-5.2.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,97 +0,0 @@ |
117 |
-# Copyright 1999-2019 Gentoo Authors |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=7 |
121 |
- |
122 |
-inherit flag-o-matic toolchain-funcs |
123 |
- |
124 |
-if [[ ${PV} == "9999" ]] ; then |
125 |
- EGIT_REPO_URI="https://github.com/strace/strace.git" |
126 |
- inherit git-r3 autotools |
127 |
-else |
128 |
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" |
129 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
130 |
-fi |
131 |
- |
132 |
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool" |
133 |
-HOMEPAGE="https://strace.io/" |
134 |
- |
135 |
-LICENSE="BSD" |
136 |
-SLOT="0" |
137 |
-IUSE="aio perl static unwind elfutils" |
138 |
- |
139 |
-REQUIRED_USE="?? ( unwind elfutils )" |
140 |
- |
141 |
-LIB_DEPEND=" |
142 |
- unwind? ( sys-libs/libunwind[static-libs(+)] ) |
143 |
- elfutils? ( dev-libs/elfutils[static-libs(+)] ) |
144 |
-" |
145 |
-# strace only uses the header from libaio to decode structs |
146 |
-DEPEND=" |
147 |
- static? ( ${LIB_DEPEND} ) |
148 |
- aio? ( >=dev-libs/libaio-0.3.106 ) |
149 |
- sys-kernel/linux-headers |
150 |
-" |
151 |
-RDEPEND=" |
152 |
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
153 |
- perl? ( dev-lang/perl ) |
154 |
-" |
155 |
- |
156 |
-PATCHES=( "${FILESDIR}"/${P}-linux-5.3-compat.patch ) |
157 |
- |
158 |
-src_prepare() { |
159 |
- default |
160 |
- |
161 |
- if [[ ! -e configure ]] ; then |
162 |
- # git generation |
163 |
- sed /autoreconf/d -i bootstrap || die |
164 |
- ./bootstrap || die |
165 |
- eautoreconf |
166 |
- [[ ! -e CREDITS ]] && cp CREDITS{.in,} |
167 |
- fi |
168 |
- |
169 |
- filter-lfs-flags # configure handles this sanely |
170 |
- # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. |
171 |
- use static && append-ldflags -static -pthread |
172 |
- |
173 |
- export ac_cv_header_libaio_h=$(usex aio) |
174 |
- use elibc_musl && export ac_cv_header_stdc=no |
175 |
- |
176 |
- # Stub out the -k test since it's known to be flaky. #545812 |
177 |
- sed -i '1iexit 77' tests*/strace-k.test || die |
178 |
-} |
179 |
- |
180 |
-src_configure() { |
181 |
- # Set up the default build settings, and then use the names strace expects. |
182 |
- tc-export_build_env BUILD_{CC,CPP} |
183 |
- local v bv |
184 |
- for v in CC CPP {C,CPP,LD}FLAGS ; do |
185 |
- bv="BUILD_${v}" |
186 |
- export "${v}_FOR_BUILD=${!bv}" |
187 |
- done |
188 |
- |
189 |
- # Don't require mpers support on non-multilib systems. #649560 |
190 |
- local myeconfargs=( |
191 |
- --enable-mpers=check |
192 |
- $(use_with unwind libunwind) |
193 |
- $(use_with elfutils libdw) |
194 |
- ) |
195 |
- econf "${myeconfargs[@]}" |
196 |
-} |
197 |
- |
198 |
-src_test() { |
199 |
- if has usersandbox ${FEATURES} ; then |
200 |
- ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 |
201 |
- return 0 |
202 |
- fi |
203 |
- |
204 |
- default |
205 |
-} |
206 |
- |
207 |
-src_install() { |
208 |
- default |
209 |
- if ! use perl ; then |
210 |
- rm "${ED}"/usr/bin/strace-graph || die |
211 |
- fi |
212 |
- dodoc CREDITS |
213 |
-} |