gentoo resync : 25.08.2020

5 files changed, 59 insertions, 12 deletions

diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 521d696af36b..0e4663bd2929 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,6 +1,7 @@
+AUX 2.8-musl-tests.patch 1068 BLAKE2B 804671d01cba50821e63d60dd54154506be03fa8aa4a5ea5d3fccc1c7e1f7550e4f30f6792051f8ce7c47c8cedbbe54df0324060a9f0b306383a288c95667ed2 SHA512 f16c2fe9406c4865887ba1698eada2151e27b47a3cc73a6d3a8c3ca769102ca064f141e0137e168a8c2613dd4f663a5c7a3a7128d51d03fd9889835f0bc217a8
 AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832f7b95bfc66686751f9f2d8b9eef4ef6b7d73f7fe9296d5d04a154b0330f71000065f03412b440c010d44439e6 SHA512 d1a3f447037c4b7408fa20710989b262d37072c4e0552b74e3e25b673f3da4cb0280bbdccfe2e1c97eeb0b318b3923ad9a3d9afab17ba067e7b6755f33ad4f1d
-DIST gperftools-2.6.2.tar.gz 911811 BLAKE2B 1201185f3008f75b9db219e47658f5b34294f15d5cae5a9badbc2718d63e58c07e485e84f6af05bdd12398c7ab8af520db9f34f4b33b790b0276ba10fb945358 SHA512 2630687d98cdb7011b9b90ba65e337d74f7e1f7d44190edf5414d0898b906686e547e4bb08979f26fb16ca1ccc065a5a1022dee03539bb1ccdf136439eb99ec1
 DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77
-EBUILD google-perftools-2.6.2.ebuild 2222 BLAKE2B 3a4bbffae09223f1bde0ac608a1a18d569bd6d1862431a24143b7e8d7fee24ffcc4784765735011975569a6d84acbaf6ee22afab4a656dff2faad2def164ca00 SHA512 60f1bcbe05561d9d91b51b314e56e46f81a862a7cc849e832c7e72d923be012569b184e4a49549db84edb85786327fe8e0f6827f28424afa482dcb85caf405c2
-EBUILD google-perftools-2.7-r1.ebuild 2373 BLAKE2B 95f86af58931aefc9f23db1674436e17a6d04e8f2063d819a44e91e912ff8beb6ae8f3a2592d74234a5b5760740f5cfda3a405f65bf31f30b39f2da99195ea93 SHA512 52d76bd7a90cc3ddd1e554d0640b922d4a07c007adc8144e08075f439973c73631ddd895c20d7633866552f26b98f2a6a3991bb5c0203620a4fdc93aa8219934
-MISC metadata.xml 955 BLAKE2B 55eb639ddb1563627f2d3dc6e899600f1ad13cd852c67aca96d1cf2d2f2a5b0df3bde4312d952fe37bb2ad15cefb48777252e96846bc0f88f734955fa1cb7e55 SHA512 b20602a04f497995155d79457ea37d3a7df01288c8da99989798f72a38f30f8796dd65a31422e7aa3062e0d7e0a209760fac5f78311570a6387bf006c044897a
+DIST gperftools-2.8.tar.gz 928379 BLAKE2B e94bac4153cb5d3170d6486a9065b56d631ab261d25b4a5a150f04f87f767c203508839daf400dbe06dc82e9e3da2988e4b4c74725c6be836fa9c70ed0576209 SHA512 c959ffa2b36ecfea10927b40b6dd668385cff7eab3c4bc2d7c5aed5f4de87ce8e4f9b30ab44652a0288badbb6c5aa7110c491b13c4030fb656609c2eb25918a8
+EBUILD google-perftools-2.7-r1.ebuild 2410 BLAKE2B 24f3d8e35ac243ed10d1be42498845a4c462158b56faa4a6c8ae3e18cf4d4ae4c326561d2407e702f9777d39e03b1b889efbf960c3ca64acf0cc118d735f5775 SHA512 fbb6a745414d0fc606a560cd86a9acb60f3b504a3c19128c26e96c8fab67b9ddd6b7138edbfd680f46d8e25662c7eb0c89cc07079a09f2bec1a2f0ae4feef11a
+EBUILD google-perftools-2.8.ebuild 2458 BLAKE2B 54871c3ba0c08bb28b18ee0aab24fca1ad455358d172f738cfee926c7290066b06ab2dc5f08c409eaa86d4b48345a2b4baa6b2db0168ca401185ba6427882bec SHA512 ba816192037a1a8bfad8b1d295fefd29da93ea06e4361c52227b120371d9cb0b5ec9da3f4861671f7ec8335c2811b058b77878553acb98dd7c8bc2d34f995c43
+MISC metadata.xml 1128 BLAKE2B 68fdc3c01ff36a8915e07fbfbead0d1c77522dcda726287603fc77807bf062794d6255c76f53acb1e68ff9c0db7dc2da07e69632480059a814240ceec69d3bd6 SHA512 42b5ba08a7a9b64141352a3c9465f0ecea9a58ef336ede3def57165697832b0ad5b1ac4798aeb37e3ecf3d2bcc5b53f9225f31039ab585eb37d4b59303d741d0
diff --git a/dev-util/google-perftools/files/2.8-musl-tests.patch b/dev-util/google-perftools/files/2.8-musl-tests.patch
new file mode 100644
index 000000000000..660099a6a88b
--- /dev/null
+++ b/dev-util/google-perftools/files/2.8-musl-tests.patch
@@ -0,0 +1,28 @@
+From 1d9b8bb59d5610f2c3e9faad6bbd91ceca17fb93 Mon Sep 17 00:00:00 2001
+From: Aliaksey Kandratsenka <alkondratenko@gmail.com>
+Date: Sat, 11 Jul 2020 20:33:40 -0700
+Subject: [PATCH] don't test sbrk hook if we're on linux and don't have __sbrk
+
+"mmap" hooks code for linux only hooks sbrk when __sbrk is
+defined. But musl doesn't offer this function (reasonably so), so
+sbrk hooking doesn't work there. Not big loss, but lets make sure
+tests don't fail.
+
+Lets reference this to issue #1198
+---
+ src/tests/tcmalloc_unittest.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/tcmalloc_unittest.cc b/src/tests/tcmalloc_unittest.cc
+index d06c5a86..9d303433 100644
+--- a/src/tests/tcmalloc_unittest.cc
++++ b/src/tests/tcmalloc_unittest.cc
+@@ -1503,7 +1503,7 @@ static int RunAllTests(int argc, char** argv) {
+ 
+     // Test sbrk
+     SetSbrkHook();
+-#if defined(HAVE_SBRK) && defined(__linux) && \
++#if defined(HAVE___SBRK) && defined(__linux) && \
+        (defined(__i386__) || defined(__x86_64__))
+     p1 = sbrk(8192);
+     CHECK(p1 != NULL);
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
index 9db41fc3dc0f..76dc02a2af33 100644
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
@@ -25,7 +25,10 @@ RESTRICT="!test? ( test )"
 DEPEND="!ppc64? ( sys-libs/libunwind )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/fix_ppc64el_FTBFS.patch )
+PATCHES=(
+	"${FILESDIR}"/fix_ppc64el_FTBFS.patch
+	"${FILESDIR}/2.8-musl-tests.patch"
+)
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.8.ebuild
index 9d0679575689..b5cb254c7978 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
+
+inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
 
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="https://github.com/gperftools/gperftools"
@@ -17,16 +17,20 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal optimisememory test static-libs"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="largepages largepages64k +debug minimal optimisememory test static-libs"
+
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/libunwind"
+DEPEND="!ppc64? ( sys-libs/libunwind )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-HTML_DOCS="docs"
+PATCHES=(
+	"${FILESDIR}/${PV}-musl-tests.patch"
+)
 
 pkg_setup() {
 	# set up the make options in here so that we can actually make use
@@ -48,6 +52,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+	use largepages64k && append-cppflags -DTCMALLOC_LARGE_PAGES64K
 	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
@@ -82,3 +87,8 @@ src_install() {
 
 	multilib-minimal_src_install
 }
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index 64f38d90459e..b29352921cb9 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -11,6 +11,11 @@
 			memory usage, but should speed up the allocation/free
 			operations.
 		</flag>
+		<flag name="largepages64k">
+			Use (experimental) 64K pages for tcmalloc, this increases
+			memory usage, but should speed up the allocation/free
+			operations.
+		</flag>
 		<flag name="debug">
 			Build a set of libraries with debug support (so-called
 			debugalloc). These are available by default but are not needed