commit: cfba1140f658bf94ac22b666be7c2e630c12a02a Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Mar 11 17:34:22 2023 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sat Mar 11 17:35:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfba1140
dev-libs/FBGEMM: fix build with gcc-13 Closes: https://bugs.gentoo.org/894628 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild | 54 ---------------------- dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild | 1 + dev-libs/FBGEMM/Manifest | 1 - .../FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch | 10 ++++ 4 files changed, 11 insertions(+), 55 deletions(-) diff --git a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild deleted file mode 100644 index a505928cb56c..000000000000 --- a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 flag-o-matic cmake - -CommitId=135412d2646f3bd753c8f1cfd33616110bbccd27 - -DESCRIPTION="Facebook GEneral Matrix Multiplication" -HOMEPAGE="https://github.com/pytorch/FBGEMM"; -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -DEPEND=" - ~dev-libs/asmjit-2021.11.13 - dev-libs/cpuinfo -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) - ${PYTHON_DEPS} -" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - # Bug #855668 - filter-lto - - rm test/RowWiseSparseAdagradFusedTest.cc || die - rm test/SparseAdagradTest.cc || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFBGEMM_LIBRARY_TYPE=shared - -DFBGEMM_BUILD_BENCHMARKS=OFF - -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild index 9a2f09a92e45..b2c8f05937d7 100644 --- a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild +++ b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild @@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN}-${CommitId} PATCHES=( "${FILESDIR}"/${PN}-2022.01.13-gentoo.patch + "${FILESDIR}"/${P}-gcc13.patch ) src_prepare() { diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest index 5fd675cbb2ad..70bae9073b04 100644 --- a/dev-libs/FBGEMM/Manifest +++ b/dev-libs/FBGEMM/Manifest @@ -1,2 +1 @@ -DIST FBGEMM-2022.01.13.tar.gz 532297 BLAKE2B bced7e1a1712351a87762e8d0a28ed3bbc5678c8ce70b440e769e53dc15f68e3ec8c89df9307f33da788bd376613720892493c0b519d3860a6e2edb48de1fdba SHA512 a416c2c11b0e6798e0dbb376050ead79cb602cd4f0e41b6109eeefe3e939e410adf0ce828d1224a358eb8245a935cc431d8023ccc396f08ca88276fb91c66157 DIST FBGEMM-2022.07.16.tar.gz 744470 BLAKE2B d1ee51ad72a22fb1b7abaefe330f70e27bc5d6dfda2587373d7e0209aef099ab10c8772612a9786fc2bd760f66154053b9e6c9a6b7f3c82ed2114536f7b30213 SHA512 7d245ea47c57c2da0555693624c45c8585aab5d1b171c9f3b909e140d9d0964cb9cf8f029c291c45f8070d5cfad6f7116e606fdd4120b2223279e39d4ba3f189 diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch new file mode 100644 index 000000000000..cba259688d96 --- /dev/null +++ b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch @@ -0,0 +1,10 @@ +--- a/include/fbgemm/UtilsAvx2.h 2023-03-11 17:17:28.365325199 +0100 ++++ b/include/fbgemm/UtilsAvx2.h 2023-03-11 17:18:06.076766162 +0100 +@@ -9,6 +9,7 @@ + // flags. + + #include <string> ++#include <cstdint> + + namespace fbgemm { +
