Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/lttng-ust/files/
Date: Thu, 28 Apr 2022 20:53:34
Message-Id: 1651179137.a49f48c6f582174036dc4a029a00768bb4a6ac06.conikost@gentoo
1 commit: a49f48c6f582174036dc4a029a00768bb4a6ac06
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu Apr 28 15:56:54 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 28 20:52:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49f48c6
7
8 dev-util/lttng-ust: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/25240
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/lttng-ust-2.11.0-fno-common.patch | 47 ----------------------
16 1 file changed, 47 deletions(-)
17
18 diff --git a/dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch b/dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch
19 deleted file mode 100644
20 index 48b5bfbbe39c..000000000000
21 --- a/dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch
22 +++ /dev/null
23 @@ -1,47 +0,0 @@
24 -From 21a934df4c683e73e0a66a9afca33573fcf9d789 Mon Sep 17 00:00:00 2001
25 -From: Michael Jeanson <mjeanson@××××××××.com>
26 -Date: Thu, 16 Jan 2020 10:59:14 -0500
27 -Subject: [PATCH] Fix: build with -fno-common
28 -
29 -GCC 10 will default to building with -fno-common, this inhibits the
30 -linker from merging multiple tentative definitions of a symbol in an
31 -archive. Keep only the declaration in the libustsnprintf.la convenience
32 -library.
33 -
34 -Signed-off-by: Michael Jeanson <mjeanson@××××××××.com>
35 -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@××××××××.com>
36 -Change-Id: I8fb7c72811ce7e62f10342f55fcabeeabfdd4c67
37 ----
38 - liblttng-ust-ctl/ustctl.c | 2 --
39 - liblttng-ust-fd/lttng-ust-fd.c | 2 --
40 - 2 files changed, 4 deletions(-)
41 -
42 -diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
43 -index 949ece17..c2b761a1 100644
44 ---- a/liblttng-ust-ctl/ustctl.c
45 -+++ b/liblttng-ust-ctl/ustctl.c
46 -@@ -77,8 +77,6 @@ extern void lttng_ring_buffer_client_discard_exit(void);
47 - extern void lttng_ring_buffer_client_discard_rt_exit(void);
48 - extern void lttng_ring_buffer_metadata_client_exit(void);
49 -
50 --volatile enum ust_loglevel ust_loglevel;
51 --
52 - int ustctl_release_handle(int sock, int handle)
53 - {
54 - struct ustcomm_ust_msg lum;
55 -diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c
56 -index 863f0618..4818e02e 100644
57 ---- a/liblttng-ust-fd/lttng-ust-fd.c
58 -+++ b/liblttng-ust-fd/lttng-ust-fd.c
59 -@@ -28,8 +28,6 @@
60 - #include <helper.h>
61 - #include "usterr-signal-safe.h"
62 -
63 --volatile enum ust_loglevel ust_loglevel;
64 --
65 - static int (*__lttng_ust_fd_plibc_close)(int fd);
66 - static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream);
67 -
68 ---
69 -2.25.0
70 -