commit: 321179fc6b5e87990d0a9a54d868a63774e9a345 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Tue Mar 11 13:45:45 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 12 09:43:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321179fc
sys-apps/hwloc: fix enable-gl [LTO] Closes: https://bugs.gentoo.org/949986 Closes: https://bugs.gentoo.org/934428 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../hwloc/files/hwloc-2.11.2-fix-enable-gl.patch | 27 ++++++++++++++++++++++ sys-apps/hwloc/hwloc-2.11.2.ebuild | 7 +++++- sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 7 +++++- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch b/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch new file mode 100644 index 000000000000..25e2b2c8f791 --- /dev/null +++ b/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch @@ -0,0 +1,27 @@ +From fe2eb291c5d91a02f01a051de150acfe37598ade Mon Sep 17 00:00:00 2001 +From: Paul Zander <[email protected]> +Date: Tue, 11 Mar 2025 14:36:05 +0100 +Subject: [PATCH] fix enable-gl + +Disable -Wno-error=lto-type-mismatch for broken AC_CHECK_LIB + +Bug: https://bugs.gentoo.org/949986 +Bug: https://bugs.gentoo.org/934428 +Signed-off-by: Paul Zander <[email protected]> + +diff --git a/config/hwloc.m4 b/config/hwloc.m4 +index 832ab39..4149089 100644 +--- a/config/hwloc.m4 ++++ b/config/hwloc.m4 +@@ -1488,7 +1488,7 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL); + hwloc_gl_happy=no]) + + AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [ +- AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext -lX11]) ++ AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext -lX11 -Wno-error=lto-type-mismatch]) + ], [hwloc_gl_happy=no]) + + if test "x$hwloc_gl_happy" = "xyes"; then +-- +2.48.1 + diff --git a/sys-apps/hwloc/hwloc-2.11.2.ebuild b/sys-apps/hwloc/hwloc-2.11.2.ebuild index e3e3e1709236..eb948e32bdb0 100644 --- a/sys-apps/hwloc/hwloc-2.11.2.ebuild +++ b/sys-apps/hwloc/hwloc-2.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,6 +54,11 @@ DOCS=( AUTHORS NEWS README VERSION ) src_prepare() { default + # bug #934428 #949986 + if tc-is-gcc; then + eapply "${FILESDIR}/${PN}-2.11.2-fix-enable-gl.patch" + fi + eautoreconf } diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild index 8282112e6b86..8cb15d78d7cf 100644 --- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild +++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,6 +54,11 @@ DOCS=( AUTHORS NEWS README VERSION ) src_prepare() { default + # bug #934428 #949986 + if tc-is-gcc; then + eapply "${FILESDIR}/${PN}-2.11.2-fix-enable-gl.patch" + fi + eautoreconf }
