Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/sysprof/, dev-util/sysprof/files/
Date: Sun, 30 Aug 2020 13:11:49
Message-Id: 1598793089.7e190c9a2200ebe2115be1c3044be955bdcefc3b.leio@gentoo
1 commit: 7e190c9a2200ebe2115be1c3044be955bdcefc3b
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 13:11:16 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 13:11:29 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e190c9a
7
8 dev-util/sysprof: fix tests compilation on 32bit architectures
9
10 Closes: https://bugs.gentoo.org/739626
11 Package-Manager: Portage-2.3.103, Repoman-2.3.20
12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
13
14 .../files/3.36.0-fix-32bit-tests-build.patch | 29 ++++++++++++++++++++++
15 dev-util/sysprof/sysprof-3.36.0.ebuild | 4 +++
16 2 files changed, 33 insertions(+)
17
18 diff --git a/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch
19 new file mode 100644
20 index 00000000000..a9d4ab58ef9
21 --- /dev/null
22 +++ b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch
23 @@ -0,0 +1,29 @@
24 +From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001
25 +From: Rasmus Thomsen <oss@×××××××.dev>
26 +Date: Sat, 7 Mar 2020 10:44:16 +0100
27 +Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for
28 + gsize
29 +
30 +This fixes the build on 32-bit platforms with -Werror-format
31 +
32 +fixes #32
33 +---
34 + src/tests/allocs-by-size.c | 2 +-
35 + 1 file changed, 1 insertion(+), 1 deletion(-)
36 +
37 +diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c
38 +index 666113a..6260d4b 100644
39 +--- a/src/tests/allocs-by-size.c
40 ++++ b/src/tests/allocs-by-size.c
41 +@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader)
42 + {
43 + const Item *item = &g_array_index (ar, Item, i);
44 +
45 +- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n",
46 ++ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n",
47 + item->size, item->cmp, item->count);
48 + }
49 + }
50 +--
51 +2.20.1
52 +
53
54 diff --git a/dev-util/sysprof/sysprof-3.36.0.ebuild b/dev-util/sysprof/sysprof-3.36.0.ebuild
55 index f177e8ac828..4d74c726696 100644
56 --- a/dev-util/sysprof/sysprof-3.36.0.ebuild
57 +++ b/dev-util/sysprof/sysprof-3.36.0.ebuild
58 @@ -34,6 +34,10 @@ BDEPEND="
59 virtual/pkgconfig
60 "
61
62 +PATCHES=(
63 + "${FILESDIR}"/${PV}-fix-32bit-tests-build.patch
64 +)
65 +
66 src_prepare() {
67 xdg_src_prepare
68 # These are installed by dev-util/sysprof-capture