From 2ac7305c948d1ecbe446d3aac337f698a38fa463 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Tue, 18 Aug 2026 00:02:27 +0200 Subject: [PATCH] dev-embedded/simulavr: fix build with modern GCC The bundled googletest 1.10.0 copy under regress/gtest fails to compile with GCC 15: gtest-death-test.cc uses uintptr_t without including , which older GCC/libstdc++ used to pull in transitively via but no longer does. The regress/ subdirectory is unconditionally added to the "all" target with no CMake toggle to skip it, so this breaks a plain build, not just `make check`. Verified by building the release-1.1.0 tag standalone with cmake/make outside the ebuild sandbox: the fix lets both the main build and `make doc` complete. Co-Authored-By: Claude Sonnet 5 --- dev-embedded/simulavr/Manifest | 3 ++- dev-embedded/simulavr/files/fix-gcc15-cstdint.patch | 10 ++++++++++ dev-embedded/simulavr/simulavr-1.1.0.ebuild | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 dev-embedded/simulavr/files/fix-gcc15-cstdint.patch diff --git a/dev-embedded/simulavr/Manifest b/dev-embedded/simulavr/Manifest index 0d16897..e7a275a 100644 --- a/dev-embedded/simulavr/Manifest +++ b/dev-embedded/simulavr/Manifest @@ -1,4 +1,5 @@ +AUX fix-gcc15-cstdint.patch 264 BLAKE2B 04fca67b8dc33d8390568fe9428339913590bc953037b1861cca276c438eb35e61a2fc9ecb26caf3170baf93c410c12c750d17a54385fa97d42bceb0fb5640c5 SHA512 db8fe246022b564593e44a124dc0dde2f960be30ce8921bcea051535a35d27ddd0019eb56f2ec1659e206edc5411446f66cafa7b9f2dd44e0135ef77e1a86c1a AUX fix-git-version.patch 395 BLAKE2B cf3ffb959df473b623cfe583b07adfc7a45015e617fff053a04eb9ba79818afb4a885b0e772f4874e4168297634fc3cb026e73c43366492d8c30f4ba8d568e17 SHA512 9b54de9253041dbdd481c19c200fe273de5ecbfcbf0466620391e223b5f931d4afc47fff531aaedb605627fedb166c60f93d80a1c890b9c265ba76c2d1a66db6 AUX fix-installpath.patch 3774 BLAKE2B f6f5fb89e95fe8552d01bd6a19b59b0e43a640c28603f50294844c1bc7f24041f94033cac60176cec5546608a613b7f9a43942288ab71e6e76a2a713b2b8289b SHA512 6c85bde849d2f1db5156361dd2ed53ecde45a069848734770fc3c86bb4a44fd01820ac42a7a83d89cfe2a6c500c66ee856dfcb9f5f5e110c587a825dabc09417 -EBUILD simulavr-1.1.0.ebuild 926 BLAKE2B bee9cf98cf0ec9d753462455d4adb4c743f6b31b2c5ee023c9f32739a194b898f056bff3b30685ce726f5a425229c2364ef017bbfac8fc0e5cdfd1a0a5f0ecd6 SHA512 564813bc0e376252b7d4defa1f7f1d560bb9ca0dd399b3f3ae1cc7d056599bad5d63923ff889491669b75fd73afcf7cf6b13cc17597fec802ea8645ba920c68e +EBUILD simulavr-1.1.0.ebuild 965 BLAKE2B a5c13940b97ff4ed58ae0caae756cc55905eab2a41a96037e01be62430eb65daddbbb58e1e8f3b8b67e1335a210d15f9bd1004c462dc6201b406eb143d743c75 SHA512 5f5dfe73d47808f41e598e78f6553a22deb169cbb42b43c6e0173f146736c22c302cb9cf29a55fc62c25d50506426fb52db22a2ac069a23aec4da83456fdaf0a MISC metadata.xml 335 BLAKE2B 9d4384e13955a58a54a4245eece277c86283f1575beabfdef7ef06d8cb552d35af025ca1d4e613bb0d6c288ca460fa60fc9567ab824cf11bf51484a8f486920b SHA512 4c11645a0cf7e2f3fe74332cf91c5cfab17ca8c17eeb4fc06bbaa2ab55ba8a2c61941d49b5642998051a21fbcad88e65b62ee8ef7b3bb10e48bf37520bd56fa5 diff --git a/dev-embedded/simulavr/files/fix-gcc15-cstdint.patch b/dev-embedded/simulavr/files/fix-gcc15-cstdint.patch new file mode 100644 index 0000000..78c5f4a --- /dev/null +++ b/dev-embedded/simulavr/files/fix-gcc15-cstdint.patch @@ -0,0 +1,10 @@ +--- a/regress/gtest/gtest-1.10.0/src/gtest-death-test.cc ++++ b/regress/gtest/gtest-1.10.0/src/gtest-death-test.cc +@@ -46,6 +46,7 @@ + # include + # include + # include ++# include + + # if GTEST_OS_LINUX + # include diff --git a/dev-embedded/simulavr/simulavr-1.1.0.ebuild b/dev-embedded/simulavr/simulavr-1.1.0.ebuild index 455a5f9..b12223c 100644 --- a/dev-embedded/simulavr/simulavr-1.1.0.ebuild +++ b/dev-embedded/simulavr/simulavr-1.1.0.ebuild @@ -27,6 +27,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/fix-git-version.patch" "${FILESDIR}/fix-installpath.patch" + "${FILESDIR}/fix-gcc15-cstdint.patch" ) src_configure() { -- 2.39.5