gentoo auto-resync : 12:04:2023 - 11:41:02

4 files changed, 21 insertions, 8 deletions

diff --git a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
index 194619787e6d..22674b795e6c 100644
--- a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
+++ b/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
@@ -50,6 +50,7 @@ python_check_deps() {
 PATCHES=(
 	"${FILESDIR}"/${PN}-2022.01.13-gentoo.patch
 	"${FILESDIR}"/${PN}-2022.07.16-gcc13.patch
+	"${FILESDIR}"/${P}-test.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
index b094d6dca180..56b9ce0f3228 100644
--- a/dev-libs/FBGEMM/Manifest
+++ b/dev-libs/FBGEMM/Manifest
@@ -1,5 +1,6 @@
-AUX FBGEMM-2022.01.13-gentoo.patch 2260 BLAKE2B c3c690490b200e1191013259872ef826b63012161cb5664f11f2e838a632fd010a17d6913bd89c7fc45850c5e3273a0d087081b63964483fefd21f02fee60403 SHA512 f4c7c58e45568303aa2d9308586adb544185f30f72d989928889ef46c9ec44342272a865185cdeef761e5ce4e44299a08de4aff2a7b30efa4cc90a26cca14861
+AUX FBGEMM-2022.01.13-gentoo.patch 2202 BLAKE2B 541f97c2e57c13659bbd2ffc165f72062a24a93d6e5bb39e48986c0b40c9b69270798920afc4e714fa8d0d80f4ccaaf8c2d01a8d6acda6cbada8425c24c49bf5 SHA512 2c794446af33ba8ae521ce061dee76d286e61877c44d657f9436ac38c7a3a80439b25daea534ed89aeedfee02fbc031e5da70cdf446e4dee4bf2c96e91a340dc
 AUX FBGEMM-2022.07.16-gcc13.patch 230 BLAKE2B f90e3efc20dee725ca1f6b93180b0176090fd314b7049d90285e7d7634af8cacc588560f593d475db73c04c9f14ae620d2ab27ee974e7a473b806254cfb5f923 SHA512 abd30f206bba3104c0b675a52c3320a251b769e9f1ea58a79de351d0d2e57e81265c554e7e8cb505014a1b5d7f7edd77d838eec33bb0fd932dfbc795b1d732e4
+AUX FBGEMM-2023.02.10-test.patch 432 BLAKE2B 036f437280f186dbf970a4e3b9a8c729b0f5f6878f7daa0aa750e106b9848423a55a5a43efb1d2f5f800121a034384e7480773bf856d71517ad3daa49dc02aa4 SHA512 ba2c12e42c6f6afb4ea772ff80b5e1040b311af6457cb17d08bd254b4458d520f1a70acb2f63335ee2a06c168508d657b71adfc7ed4b697c8469cb140ed23b2f
 DIST FBGEMM-2023.02.10.tar.gz 854918 BLAKE2B 2af11baf95c1f33e1b1dd6f2a51dde2c991ff0f606402a7aaa539b7bc505c3707cafaa96d8f742c91672ec09a1f18a69f0e69c012b6db11d5297d602b8f4860c SHA512 a59d928150d674c56b5d38f73e62b5f4e2b527ea1f7ebb891ea1d3356e4183e0f469d145fca37fcb1c85f8773cf54226a8e41389fe9783474c457a7bd31846d6
-EBUILD FBGEMM-2023.02.10.ebuild 1629 BLAKE2B 3d066c2f22f9d79815547705cd1026d92f0ad18fc1c40c2e714b8b63957ef8b14deb078d782a39cd5d0d155e7e362335135d719bcfeccfa990a642952366262a SHA512 0abe6c97b5a48b9f40288d04401b68a2295bdd8561ff022523fd2515c6174867bcfdee706ae207e88343b1b9f187026d3dd98ba311a04585eda7e52d52ef377c
+EBUILD FBGEMM-2023.02.10.ebuild 1660 BLAKE2B d1cd715600325f47757a6c7e030d394e27ff2d929eaf1dba04bc5be0a2a0ccd2aeb9b2834488158e396acbdc3b67e700553dcbd05b87946d1095feb8c367deda SHA512 67c91bf0e4beb0005fe088d6ca8bde434c92d381ebd543d22e1872ab9e7778a1d49a38fd4a2ae8fc3ef09b5e9928139ce82d8dd7830b2b8fc755d00c7783096d
 MISC metadata.xml 327 BLAKE2B 860b9c0ecb3b0029c855db0a0054590135f3bd6ec9dad20cdf433fc70c119354518eea50fdbb2a204eb8cc6621de23e6928a2f9ec961ac0c51fd9dae22fa8488 SHA512 3a0d5a69421a41e62ce134636025e0024010c1938ee35f7489d8d870d915a66cd526aa60d107a378dc4522ff71b7f10486e20867c8b424b1b47e458988ebff58
diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
index e2aacd3f65ef..9ff87d5b6cb4 100644
--- a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
+++ b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt	2022-05-21 13:13:50.806813151 +0200
 +++ b/CMakeLists.txt	2022-05-21 13:16:46.448969453 +0200
-@@ -165,7 +165,7 @@
+@@ -187,7 +187,7 @@
  message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
  message(WARNING "==========")
  
@@ -9,8 +9,8 @@
    #Download asmjit from github if ASMJIT_SRC_DIR is not specified.
    if(NOT DEFINED ASMJIT_SRC_DIR)
      set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit"
-@@ -184,7 +184,7 @@
-   set_property(TARGET asmjit PROPERTY POSITION_INDEPENDENT_CODE ON)
+@@ -216,7 +216,7 @@
+   endif()
  endif()
  
 -if(NOT TARGET cpuinfo)
@@ -18,7 +18,7 @@
    #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
    if(NOT DEFINED CPUINFO_SOURCE_DIR)
      set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo"
-@@ -261,7 +261,6 @@
+@@ -293,7 +293,6 @@
  
  target_link_libraries(fbgemm $<BUILD_INTERFACE:asmjit>
    $<BUILD_INTERFACE:cpuinfo>)
@@ -26,7 +26,7 @@
  
  install(TARGETS fbgemm EXPORT fbgemmLibraryConfig
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -268,6 +268,8 @@
+@@ -302,6 +301,8 @@
  
  install(FILES ${FBGEMM_PUBLIC_HEADERS}
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm")
@@ -45,7 +45,7 @@
    #Download Googletest framework from github if
    #GOOGLETEST_SOURCE_DIR is not specified.
    if(NOT DEFINED GOOGLETEST_SOURCE_DIR)
-@@ -62,7 +62,6 @@
+@@ -67,7 +67,6 @@
      target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES})
    endif()
  
diff --git a/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch b/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch
new file mode 100644
index 000000000000..062887a01819
--- /dev/null
+++ b/dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch
@@ -0,0 +1,11 @@
+--- 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