commit: 37c1cb1766eec979844d0718a81936797391ed4a Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Wed Apr 12 06:11:34 2023 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Wed Apr 12 06:13:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c1cb17
dev-libs/FBGEMM: test require C++14 Closes: https://bugs.gentoo.org/904134 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild | 1 + dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch | 12 ++++++------ dev-libs/FBGEMM/files/FBGEMM-2023.02.10-test.patch | 11 +++++++++++ 3 files changed, 18 insertions(+), 6 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/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
