summaryrefslogtreecommitdiff
path: root/dev-util/strace
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-10 21:05:55 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-10 21:05:55 +0000
commit71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree9f1f0dee23e13658e52f49437befe78427148c51 /dev-util/strace
parent29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
gentoo resync : 10.02.2020
Diffstat (limited to 'dev-util/strace')
-rw-r--r--dev-util/strace/Manifest5
-rw-r--r--dev-util/strace/files/strace-5.2-linux-5.3-compat.patch75
-rw-r--r--dev-util/strace/strace-5.5.ebuild (renamed from dev-util/strace/strace-5.2.ebuild)10
3 files changed, 8 insertions, 82 deletions
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 784e2884d9b7..7452581acf6b 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,12 +1,11 @@
-AUX strace-5.2-linux-5.3-compat.patch 3982 BLAKE2B d60a8a17c6a5e1831d9a37dc5dffc1195c4d7ca27be9bb1e1e4ab109aa1813fd08dec512e7e1cdd836d638030140d5f31a07839ceb5fb01c2d9b32bdd83f27bf SHA512 46c442340aa27b1bb6616efd1bb33c0df2987cc75658555e72401c0628787785070579e2054fb9765e5e184f83f3e233594eee8a5589f48d7e1364d011e5c213
AUX strace-5.4-fix-LTO-CFLAGS-handling.patch 843 BLAKE2B 2cd4c87e972b2bfe6d5755141a64ffbca386047ea68d37c8871bc37e7475f8eb3ce978ead5082ecb3099f599e12914f087773733a7440875a084a5b452b1f92c SHA512 9606c3334d3e01aecccafaa396b5a7440a652872c590ced3c1a88ca6ef083c176a420dfb2154396f94f65b826d6fe2f20556620f364c17d01d0069d630dc5cfe
DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
-DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
+DIST strace-5.5.tar.xz 1628744 BLAKE2B ae2ab9b2c756858c3c23640ee19821b8720da84a5e15e4a674768d8f4b51d74b2b490cfa18a862bc3c9d129baeaf09212700bea98ac151db035d03a05afa055d SHA512 317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231
EBUILD strace-4.26.ebuild 2289 BLAKE2B 9401f15b3cca328531c2ed600f7da2d85fda262482afccea2ac04a2e1f0d0c9fa0de8811e249902584b1efbe53b7f0e7c54ba05180981886778fd3794607655f SHA512 2471e36a14163e1129f7cdbb154d202bc0f4eea63bcaa462ecc4785114878045e62d682cbfb912e105f492cf18b0bc8bd8842842e32c61f04ccc87358e8a0274
-EBUILD strace-5.2.ebuild 2391 BLAKE2B 903f519f389605b6aae22b20609070ae0b2703cdee5952aeb5e153cfea38ed01dfc8721ab40e121bdb40c835fb8d4d053fb8867cef6a3ec3fd86e638a591aaa0 SHA512 489e8ac527c80af548ea5bd0d895f658c6b4f9c0976879e4b5f2aa96b1a4686f81d8548f980a5a6b110d6c790a68fb95cee8ef584076fe76bc026d35ab794b4c
EBUILD strace-5.3.ebuild 2326 BLAKE2B aa1914d8379ed519685b8b779c62e52c2e260fd409163eb7c774d9858f2be592298ce7990d146851aa3fd2082d34499afad6d2d960eee473200c6bc32bfa3dcb SHA512 c25c7cf8caed9df280f1c2a29258d8c983d6e034bf4fb3e8d55c30f312f72e76b6151663b8991c4cb949eee17e809f37aacd65c56da406f4dc40cf5f534db398
EBUILD strace-5.4.ebuild 2528 BLAKE2B ea885a47f547887f21633fa50c1834800749df4f822d22c36d2b71a17d7410ab2e3e446699af6e9eb9d436ed6580fa89019a2934f3c6e68432e5732bc850bf1f SHA512 cfed508fcfa5dff270c8d038a8dfeaf10d60ad366d7fee0854bd294b7a06d2411fa2a56965b8f4734d14d5571e391f32fadae25ba40a9e8c8c96a6a991e32b3b
+EBUILD strace-5.5.ebuild 2466 BLAKE2B 922a3bf95b7f03617a52e05074cf472b23c374a18f6a21ad5fcf605119e87532ced47313ebef81bf780a71358974e530927358d1527da01c7eb7932a6db4565e SHA512 8ccbdb58e8eb72772fd2c53a9ecabc089735b0462b2c0632387b40a42d260bc0f5e8304bd137e45c2be320a5bb8cc8b29557dcd979a3930449fcf3aa14e5f163
EBUILD strace-9999.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
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
deleted file mode 100644
index 254326f04577..000000000000
--- a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/strace/strace/commit/60da39553ff92cf741bf7f54daff636bb28cbb3c
-https://bugs.gentoo.org/695260
-
---- a/xlat/v4l2_pix_fmts.h
-+++ b/xlat/v4l2_pix_fmts.h
-@@ -269,19 +269,23 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1')
- #endif
--#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444)
-+#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('B', 'A', '1', '2')");
-+static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
--# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2')
-+# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
- #endif
--#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# undef V4L2_PIX_FMT_BGRA444
-+#endif
-+#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
-+static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('G', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('G', 'A', '1', '2')");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
--# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
-+# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2')
- #endif
- #if defined(V4L2_PIX_FMT_RGBA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_RGBA444) && HAVE_DECL_V4L2_PIX_FMT_RGBA444)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-@@ -1343,8 +1347,17 @@ const struct xlat v4l2_pix_fmts[] = {
- XLAT(V4L2_PIX_FMT_H264_NO_SC),
- XLAT(V4L2_PIX_FMT_PWC1),
- XLAT(V4L2_PIX_FMT_MPEG1),
-- XLAT(V4L2_PIX_FMT_BGRA444),
- XLAT(V4L2_PIX_FMT_SGRBG12),
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+/*
-+* V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with
-+* the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit
-+* v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12.
-+*/
-+# undef V4L2_PIX_FMT_BGRA444
-+#endif
-+ XLAT(V4L2_PIX_FMT_BGRA444),
- XLAT(V4L2_PIX_FMT_RGBA444),
- XLAT(V4L2_PIX_FMT_ABGR444),
- XLAT(V4L2_PIX_FMT_SGBRG12),
---- a/xlat/v4l2_pix_fmts.in
-+++ b/xlat/v4l2_pix_fmts.in
-@@ -37,8 +37,17 @@ V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2 */
- V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */
- V4L2_PIX_FMT_PWC1 v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
- V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */
--V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */
- V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+/*
-+ * V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with
-+ * the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit
-+ * v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12.
-+ */
-+# undef V4L2_PIX_FMT_BGRA444
-+#endif
-+V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */
- V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16 rrrrgggg bbbbaaaa */
- V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16 aaaabbbb ggggrrrr */
- V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */
diff --git a/dev-util/strace/strace-5.2.ebuild b/dev-util/strace/strace-5.5.ebuild
index 88a2db590c17..c6b8e0324fbd 100644
--- a/dev-util/strace/strace-5.2.ebuild
+++ b/dev-util/strace/strace-5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs autotools
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/strace/strace.git"
@@ -37,11 +37,13 @@ RDEPEND="
perl? ( dev-lang/perl )
"
-PATCHES=( "${FILESDIR}"/${P}-linux-5.3-compat.patch )
-
src_prepare() {
default
+ # Needed for applied patch (#701516). Remove with next version.
+ # Don't forget about autotools inherit.
+ eautoreconf
+
if [[ ! -e configure ]] ; then
# git generation
sed /autoreconf/d -i bootstrap || die