gentoo auto-resync : 25:02:2024 - 23:40:26

6 files changed, 28 insertions, 13 deletions

diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
index d8cc1075a672..9e51f55cbb04 100644
--- a/dev-libs/FBGEMM/Manifest
+++ b/dev-libs/FBGEMM/Manifest
@@ -1,4 +1,3 @@
-AUX FBGEMM-2023.02.10-test.patch 432 BLAKE2B 036f437280f186dbf970a4e3b9a8c729b0f5f6878f7daa0aa750e106b9848423a55a5a43efb1d2f5f800121a034384e7480773bf856d71517ad3daa49dc02aa4 SHA512 ba2c12e42c6f6afb4ea772ff80b5e1040b311af6457cb17d08bd254b4458d520f1a70acb2f63335ee2a06c168508d657b71adfc7ed4b697c8469cb140ed23b2f
 AUX FBGEMM-2023.11.02-gentoo.patch 2162 BLAKE2B c585ac736dc1494820e778dbba951a340b01cc60d99fe5c308bb140d42a0af8f6c05273963e0dd99a7f1ad2dc9af854702bdadf5b2682c5a959a0e742d22c772 SHA512 296d4f15e4047e98a0ccf7a3d23a9661ca2be8f4599d4dd5541f6e728f181cf58e836f09382ef2ed69792d1c9da3146a57cbce9041f7a43ab5354e641551f9fd
 DIST FBGEMM-2023.11.02.tar.gz 895265 BLAKE2B 0f884147a86881159485680f1cb0c7b7e65bba5a98e62c38534041264f920e08a268e348e3d82ba3d246226a10f592d86dc37bce0cfa42c72dad478041a6c807 SHA512 030f27a120586240c5f80026bd033cf6fedbe1ae12a667308d33d6321f2334021d474a3625795d1f34734336b688b19c09134e10d5cc8dec86e84485de298584
 DIST FBGEMM-2023.12.01.tar.gz 1004090 BLAKE2B dc19ebee06bccb888e5d03606168c7439ce8c96303a697056edd22d3a3a6ff4f4f3ddf5371d50aa774890ca1ad66d665f5e54976dc1b8da841759a3f4d64c4d7 SHA512 ab37964326d2cbbcbf0f2c722675d1f059407fc3185275d37f2e04f3e516fe0733ac1fb35351fc7e7c308e9c0da40811d3657a10a3696cb7648494df79408aab
diff --git a/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch b/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch
deleted file mode 100644
index 062887a01819..000000000000
--- a/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/CMakeLists.txt	2023-04-12 07:53:37.904871157 +0200
-+++ b/test/CMakeLists.txt	2023-04-12 07:53:56.597572954 +0200
-@@ -39,7 +39,7 @@
-     QuantizationHelpers.cc
-     TestUtils.cc)
-   set_target_properties(${TESTNAME} PROPERTIES
--          CXX_STANDARD 11
-+          CXX_STANDARD 14
-           CXX_EXTENSIONS NO)
-   #To compile test files with AVX2 turned on
-   #For static build, defining FBGEMM_STATIC to avoid generating
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d86fb5b8b849..d4a28d5e9254 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/dynolog/Manifest b/dev-libs/dynolog/Manifest
index e810a1286a64..ed484581474d 100644
--- a/dev-libs/dynolog/Manifest
+++ b/dev-libs/dynolog/Manifest
@@ -1,4 +1,5 @@
 AUX dynolog-0.3.1_p20230126-gcc13.patch 549 BLAKE2B ba45c5f8314cff93011b21209ab8f7ed6ad50cce254f27ca69a640db21a982e59ca580c3dd7e957a0231e7356a554de28f1a7ba9bd6e73bb216810e281a3422b SHA512 637d972a84c05fec703333b5d339050d0171e811673b1d8ffd6609e1b54b1baeca61cb4a6a0d3a1423c99ac6d211425c8e684712bc0847788138a83f7721ed80
+AUX dynolog-0.3.1_p20230126-musl.patch 831 BLAKE2B 793c37768d8f736b32c5be415a2499380b897934dead0385c1210890ac778a8133114dc2ad90893b2d2abdacaf48ae734fa10bc531421e81ecae36eec7d0b44f SHA512 55b618c4ff11a7f5f1d800ca1e1ba226e15cba044fc184397fea5f7aed9686268bac5c0dbeccf068af20a3d09ecc0f9a43210b16fbf8e79d42926f719d0ce8a6
 AUX dynolog-0.3.1_p20230126-noWerror.patch 779 BLAKE2B 0fe81d2e75f6c891a4f3f2e6fe137a82e7fd92f64d563b4078383e225b98dcacc1ae94b3f213c485c6cc7925d8b1bb8dec810633f37972c3fe40c1de34af9e7d SHA512 7f4a35d57c4f4576ce3268437c9a9bd1d64ff16e31e71167e70f40c9de764f3270c621c40e195369c7236d4e269095333bf4f3492277f44ddc54b2d146f0aff1
 AUX dynolog-0.3.1_p20230126-riscv.patch 535 BLAKE2B 5adf2d567972e89be58485faf3c3c9604885e2819fe180ba713a532156bd7b917c394f96a0e705356d3c19e1720c878d49d8a8f5ce26718b85ddb38b355ff2a5 SHA512 7c9b695e9e065f61167a538ef478d01ff76d328461e9490e75944050116ca0c2c1d3ac2f6fbf2a728318ed13d82c83ae1886d7a22b080eb63d24dfb105ee3974
 AUX dynolog-0.3.1_p20230126-unbundling.patch 3342 BLAKE2B 849a32d54ec86ab6ab1ca38d7c477fb1bbfd6123a1ff8d35181ba71348f692f77df6b65ff91ec2af56c54036064e267e7bf8c48cd4ec9e48ce3095cc31b40bb9 SHA512 045b95bdfb10555467524b180365159c20ae067630741caae3641ee49b31646425871a4ff84863b2057ba99bf5a06cf32853d3eed97df7e42621b6db5521520e
@@ -37,5 +38,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD dynolog-0.3.1_p20230126-r1.ebuild 2174 BLAKE2B 08048e274d549802e5527820575cbfb833f3555747999d6c93efb200646efff2760fee2b5445a9fa62e790df9b89008629e0373a4d7d301a0e7e9fa8011b6ade SHA512 39c47a107a89855b0794df70e37b87125b8c0c24219ff4d4f28703a3969467331a269d8ccdaf511215041b951d41fa536fe81f5a7e472a119883f741d1752cf5
+EBUILD dynolog-0.3.1_p20230126-r1.ebuild 2205 BLAKE2B 37bd6d8ab6ff7fbb95ddf59d42236428780cbe1ce027a1a7aca10623be714083c980bed88a5f0acf1b589a430e75ac5d78d027e25ff6336f9fb2c790fc963f7b SHA512 b280d67b52a70857238d7b43b9e5df5fe6e4d104f9008e935718e850561fe49835d8d7aaf02aea679a9f929e4cb643335f3b8fc22410a09c6d9f9651c57faa46
 MISC metadata.xml 338 BLAKE2B 0822b3b3d714781580cb971977d83cbfecc581ff88b42dd1cb964d7365b2f738c9a41c1f4cc3f3dd8240baa23c7d339dcd6b1a9169a97bd79aa92e5e838f892d SHA512 5895f072dc775f8d871f19d987869c015b5a2412af0636a7d9caf1c10817a67c9126eb9f56d86e22be1c75fc165ac6c348010e32cfdbaec32eec73f827af7be2
diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
index b1c6480f24db..929a6ab56a8d 100644
--- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
+++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-unbundling.patch
 	"${FILESDIR}"/${P}-noWerror.patch
 	"${FILESDIR}"/${P}-riscv.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 CMAKE_SKIP_TESTS=( "Defs.CpuSet" )
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-musl.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-musl.patch
new file mode 100644
index 000000000000..3890e68c4585
--- /dev/null
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-musl.patch
@@ -0,0 +1,25 @@
+diff --git a/dynolog/src/gpumon/Utils.h b/dynolog/src/gpumon/Utils.h
+index 0728cdc..844076d 100644
+--- a/dynolog/src/gpumon/Utils.h
++++ b/dynolog/src/gpumon/Utils.h
+@@ -1,19 +1,20 @@
+ // (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+ 
+ #pragma once
+ 
++#include <unistd.h>
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
+ 
+ namespace dynolog {
+ 
+ // Assume at most one pid running on each gpu device_id
+ // Result[i] is the pid running on device_id i,
+ // or -1 if no process is running
+ std::vector<pid_t> getPidsOnGpu();
+ // Input map is type <environment variable name, metadata name>
+ // output map is type <metadata name, metadata value>
+ std::unordered_map<std::string, std::string> getMetadataForPid(
+     pid_t pid,
+     const std::unordered_map<std::string, std::string>& keysMap);