gentoo (leap year) resync : 29.02.2020

4 files changed, 55 insertions, 11 deletions

diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 93e26dec209b..af594e6991b8 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,9 +1,10 @@
+AUX lttng-ust-2.11.0-fno-common.patch 1620 BLAKE2B 8603834fa34cc8fdda200d9d6808d5c7983d46cce944d22c4ea3e4caf667cba9b2a735cf9d5bb363df88ce5b443aac5eb66a25eae81cad386128be81ac4d538c SHA512 dc46d9571afbe17707495ab34cdcb32224ec5380e982157d01c7aac57da3b5449ff594583d13e21659a56dc8e1161a360e07c73804bd20801962890d539fc754
 DIST lttng-ust-2.10.6.tar.bz2 804912 BLAKE2B e320cad821f143392a95e98cf99f5a23597c25f7d570ac5ce3206cb5b4b7bd931e5eb765a133e421e78307fbd882e33ba291cc2c19e37250a87844308d1af2f3 SHA512 a689838a621e99408bea0e5b6ccd4a930dc2103ecb05c8b472974eda9387b813b1b9e59d3aeb4d04434754cfab170723baf961cd5063116916da471c04165c50
 DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e2002d8f03aa2266b5add36d06552f5620b912eeecff1173f43eec107b385f1b93783905f36a42baf5a63c37ea35fc SHA512 fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
 DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
-EBUILD lttng-ust-2.10.6.ebuild 687 BLAKE2B 9899e92ed7e601b134085ab745911b9c1db244c2cf1e9edfa01a74e49922e2bac175087a929f4affd077bece0f94f1b0dcfed422663d05fbc2ab2c710dc1615b SHA512 5e8ebc60c5a1602307dbbb3a881add54e2162f19f0c19b26c7bfff990d7de225fb2c96f37ed299c313a6a6d4316c79bb962b5731da296bfee8359f989af4100f
-EBUILD lttng-ust-2.11.0.ebuild 754 BLAKE2B fa1835f493f5c1b7536990eb325ab6f8066572961379eb0e92cd24ff7a50c9b0375de045b40ade9c23355f238c6f3f15eb2d41a48d171701a8f754fe47876841 SHA512 c3eac2ac01ef5886eea98ba5965980472940552c7144e82f29c80384965b1be5337581216ecf855a2ceccc1c8822ddfb0c1bebc8309ac011a472351432d9647c
+EBUILD lttng-ust-2.10.6.ebuild 629 BLAKE2B bb11edf5827c34386d9d39f840e7bb73fd02e77b21fd769c927ce9c9984eee985f649de56cbc12651e37ade948441a31cc0bf632fb7e0bb8dccb40c2923c61b1 SHA512 f0ad45a743fa0c193054a2c1f02294d36b8a56f7319dc7767ee9928eada6b839fa58c2888e3eff412a56154a6e8f7f74beb521cda3dbdab7da44ba93ab945b05
+EBUILD lttng-ust-2.11.0.ebuild 763 BLAKE2B 9e1b0a2e373d664950ba4699722f5f297b4f63ec27c04f89e69550032a9d6210cdcbaf13f7cf2f69f54098e2ee465ce97108067d457d02891308bd98125f7eb8 SHA512 13ef787073ed65de6f3c0bcc647ee756742003abf994cae0b8a416c45225ca603092aaa767e506c8270d6904570669a3df82b1022584abf2af08ee3f9f88ea43
 EBUILD lttng-ust-2.7.1.ebuild 631 BLAKE2B 3012f0943c2fa067ada1d93652b7bcefb4742c3a5f2407815827c0ae1648be4b78869d7d353fb5cd7db7676831df8804f56f5cfd5feb443fce8a5a99199bf6dd SHA512 c4c5260b4a5877d48c8bbfac051d7324e53866b46b6cab51d358e5ace976c1a972e929d7915331ca74be191f236f55330d5a0f0014c813d13fc08d945efcaa39
 EBUILD lttng-ust-2.8.1.ebuild 658 BLAKE2B 6feeab50ab203d51bbd7773b180242a84fb5d9d75eb8ec6df6e9ef9bbcd6c4e99dd5a05ae7ad164d79b2bcc9f24c96acebcab9ea19c7070ae858547392508781 SHA512 777d2fc75a517f13a6aa0d724b9212139d8da5f5570ea564355b617ac238b03ab95d704965426fe13fad55c9b22638674d63ee8342807a8bdd8172ab6c7ef70f
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
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 000000000000..48b5bfbbe39c
--- /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 <mjeanson@efficios.com>
+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 <mjeanson@efficios.com>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+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 <helper.h>
+ #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.10.6.ebuild b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
index ead5c2518d16..d7181325dce3 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.10.6.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
@@ -29,7 +29,3 @@ src_prepare() {
 	fi
 	eautoreconf
 }
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}
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 ecc26c91c8ac..5c31aecfe564 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() {
@@ -34,7 +36,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable numa) \
-		--docdir=/usr/share/doc/${PF}
+	econf $(use_enable numa)
 }