From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F5E2138350 for ; Mon, 17 Feb 2020 20:15:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ED49E087A; Mon, 17 Feb 2020 20:15:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C18EFE087A for ; Mon, 17 Feb 2020 20:15:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC54034E927 for ; Mon, 17 Feb 2020 20:15:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49279129 for ; Mon, 17 Feb 2020 20:15:07 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1581970493.e652e01f35129b584502ac6367de13cfbf1b528c.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/lttng-ust/, dev-util/lttng-ust/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch dev-util/lttng-ust/lttng-ust-2.11.0.ebuild X-VCS-Directories: dev-util/lttng-ust/files/ dev-util/lttng-ust/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: e652e01f35129b584502ac6367de13cfbf1b528c X-VCS-Branch: master Date: Mon, 17 Feb 2020 20:15:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e7dfa389-162d-4e7f-b7ab-e05908d2ba64 X-Archives-Hash: c1a2b471acccdcfc821c1ce3aba13b55 commit: e652e01f35129b584502ac6367de13cfbf1b528c Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Feb 17 20:14:32 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Feb 17 20:14:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e652e01f dev-util/lttng-ust: backport gcc-10 fix, bug #706862 Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/706862 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich gentoo.org> .../files/lttng-ust-2.11.0-fno-common.patch | 47 ++++++++++++++++++++++ dev-util/lttng-ust/lttng-ust-2.11.0.ebuild | 4 +- 2 files changed, 50 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..48b5bfbbe39 --- /dev/null +++ b/dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch @@ -0,0 +1,47 @@ +From 21a934df4c683e73e0a66a9afca33573fcf9d789 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Thu, 16 Jan 2020 10:59:14 -0500 +Subject: [PATCH] Fix: build with -fno-common + +GCC 10 will default to building with -fno-common, this inhibits the +linker from merging multiple tentative definitions of a symbol in an +archive. Keep only the declaration in the libustsnprintf.la convenience +library. + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Change-Id: I8fb7c72811ce7e62f10342f55fcabeeabfdd4c67 +--- + liblttng-ust-ctl/ustctl.c | 2 -- + liblttng-ust-fd/lttng-ust-fd.c | 2 -- + 2 files changed, 4 deletions(-) + +diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c +index 949ece17..c2b761a1 100644 +--- a/liblttng-ust-ctl/ustctl.c ++++ b/liblttng-ust-ctl/ustctl.c +@@ -77,8 +77,6 @@ extern void lttng_ring_buffer_client_discard_exit(void); + extern void lttng_ring_buffer_client_discard_rt_exit(void); + extern void lttng_ring_buffer_metadata_client_exit(void); + +-volatile enum ust_loglevel ust_loglevel; +- + int ustctl_release_handle(int sock, int handle) + { + struct ustcomm_ust_msg lum; +diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c +index 863f0618..4818e02e 100644 +--- a/liblttng-ust-fd/lttng-ust-fd.c ++++ b/liblttng-ust-fd/lttng-ust-fd.c +@@ -28,8 +28,6 @@ + #include + #include "usterr-signal-safe.h" + +-volatile enum ust_loglevel ust_loglevel; +- + static int (*__lttng_ust_fd_plibc_close)(int fd); + static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream); + +-- +2.25.0 + diff --git a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild index ecc26c91c8a..a3aa0dbf6f7 100644 --- a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild +++ b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,6 +23,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=("${FILESDIR}"/${P}-fno-common.patch) + S="${WORKDIR}"/${MY_P} src_prepare() {