commit: 34bd35d33f6a6eee4123e3c433645e103e4d4f97 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Mon Sep 23 17:33:55 2024 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Mon Sep 23 17:35:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34bd35d3
sys-fabric/mstflint: Remove Werror #939944, gcc15 fix #939922 Closes: https://bugs.gentoo.org/939944 Closes: https://bugs.gentoo.org/939922 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> sys-fabric/mstflint/files/mstflint-4.29.0-gcc15.patch | 12 ++++++++++++ sys-fabric/mstflint/mstflint-4.29.0_p1.ebuild | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/sys-fabric/mstflint/files/mstflint-4.29.0-gcc15.patch b/sys-fabric/mstflint/files/mstflint-4.29.0-gcc15.patch new file mode 100644 index 000000000000..19d010649ab2 --- /dev/null +++ b/sys-fabric/mstflint/files/mstflint-4.29.0-gcc15.patch @@ -0,0 +1,12 @@ +diff --git a/resourcetools/resourcedump_lib/src/filters/include_exclude_segments_filter.h b/resourcetools/resourcedump_lib/src/filters/include_exclude_segments_filter.h +index 2d1e84e2..b6e03fed 100644 +--- a/resourcetools/resourcedump_lib/src/filters/include_exclude_segments_filter.h ++++ b/resourcetools/resourcedump_lib/src/filters/include_exclude_segments_filter.h +@@ -38,6 +38,7 @@ + #include <memory> + #include <vector> + #include <sstream> ++#include <cstdint> + + namespace mft + { diff --git a/sys-fabric/mstflint/mstflint-4.29.0_p1.ebuild b/sys-fabric/mstflint/mstflint-4.29.0_p1.ebuild index 0588270f7aa7..c66b8fea31e6 100644 --- a/sys-fabric/mstflint/mstflint-4.29.0_p1.ebuild +++ b/sys-fabric/mstflint/mstflint-4.29.0_p1.ebuild @@ -35,6 +35,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/mstflint-4.29.0-build-system.patch" + "${FILESDIR}/mstflint-4.29.0-gcc15.patch" ) src_prepare() { @@ -47,6 +48,10 @@ src_prepare() { sed -e 's:_LDFLAGS = :_LDFLAGS = $(LDFLAGS) :' \ -i */Makefile.am mstdump/crd_main/Makefile.am || die + # https://bugs.gentoo.org/939944 + sed -r -e 's:-Werror(=[a-zA-Z0-9-]+|) ::' \ + -i configure.ac ext_libs/json/Makefile.am || die + printf -- '#define TOOLS_GIT_SHA "%s"' "${EGIT_COMMIT}" > ./common/gitversion.h || die eautoreconf
