summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2020-08-30 16:11:16 +0300
committerMart Raudsepp <leio@gentoo.org>2020-08-30 16:11:29 +0300
commit7e190c9a2200ebe2115be1c3044be955bdcefc3b (patch)
tree463c5372d4d9d1fbc697c7709b769ca2c95d4671
parentdev-util/oprofile: version bump (diff)
downloadgentoo-7e190c9a2200ebe2115be1c3044be955bdcefc3b.tar.gz
gentoo-7e190c9a2200ebe2115be1c3044be955bdcefc3b.tar.bz2
gentoo-7e190c9a2200ebe2115be1c3044be955bdcefc3b.zip
dev-util/sysprof: fix tests compilation on 32bit architectures
Closes: https://bugs.gentoo.org/739626 Package-Manager: Portage-2.3.103, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
-rw-r--r--dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch29
-rw-r--r--dev-util/sysprof/sysprof-3.36.0.ebuild4
2 files changed, 33 insertions, 0 deletions
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
new file mode 100644
index 000000000000..a9d4ab58ef9a
--- /dev/null
+++ b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch
@@ -0,0 +1,29 @@
+From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001
+From: Rasmus Thomsen <oss@cogitri.dev>
+Date: Sat, 7 Mar 2020 10:44:16 +0100
+Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for
+ gsize
+
+This fixes the build on 32-bit platforms with -Werror-format
+
+fixes #32
+---
+ src/tests/allocs-by-size.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c
+index 666113a..6260d4b 100644
+--- a/src/tests/allocs-by-size.c
++++ b/src/tests/allocs-by-size.c
+@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader)
+ {
+ const Item *item = &g_array_index (ar, Item, i);
+
+- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n",
++ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n",
+ item->size, item->cmp, item->count);
+ }
+ }
+--
+2.20.1
+
diff --git a/dev-util/sysprof/sysprof-3.36.0.ebuild b/dev-util/sysprof/sysprof-3.36.0.ebuild
index f177e8ac8280..4d74c726696a 100644
--- a/dev-util/sysprof/sysprof-3.36.0.ebuild
+++ b/dev-util/sysprof/sysprof-3.36.0.ebuild
@@ -34,6 +34,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-fix-32bit-tests-build.patch
+)
+
src_prepare() {
xdg_src_prepare
# These are installed by dev-util/sysprof-capture