net-libs/mbedtls: fix tests with GCC 15

GCC 15 makes a change to union initialisation and exposes a bug in mbedtls. Build with the new -fzero-init-padding-bits=unions flag if supported to fix the testsuite until the upstream bug is fixed. Bug: Mbed-TLS/mbedtls#9814 Closes: https://bugs.gentoo.org/946544 Signed-off-by: Sam James <sam@gentoo.org>
gentoo · Dec 23, 2024 · 40ea681 · 40ea681
1 parent 1d27c5d
commit 40ea681
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/net-libs/mbedtls/mbedtls-2.28.8.ebuild → net-libs/mbedtls/mbedtls-2.28.8-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.8.ebuild → net-libs/mbedtls/mbedtls-2.28.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake multilib-minimal python-any-r1
+inherit cmake flag-o-matic multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
@@ -49,6 +49,13 @@ src_prepare() {
 	cmake_src_prepare
 }
 
+src_configure() {
+	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
+	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)

diff --git a/net-libs/mbedtls/mbedtls-2.28.9.ebuild → net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.9.ebuild → net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake multilib-minimal python-any-r1
+inherit cmake flag-o-matic multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
@@ -48,6 +48,13 @@ src_prepare() {
 	cmake_src_prepare
 }
 
+src_configure() {
+	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
+	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)

diff --git a/net-libs/mbedtls/mbedtls-3.6.2.ebuild → net-libs/mbedtls/mbedtls-3.6.2-r1.ebuild b/net-libs/mbedtls/mbedtls-3.6.2.ebuild → net-libs/mbedtls/mbedtls-3.6.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake multilib-minimal python-any-r1
+inherit cmake flag-o-matic multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
@@ -42,6 +42,13 @@ src_prepare() {
 	cmake_src_prepare
 }
 
+src_configure() {
+	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
+	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)