pkg/58537: x11/qt6-qtbase does not build on Linux

[phil+netbsd%krylov.eu@localhost]

>Number:         58537
>Category:       pkg
>Synopsis:       x11/qt6-qtbase does not build on Linux
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 02 07:25:00 +0000 2024
>Originator:     Phil Krylov
>Release:        pkgsrc-current
>Organization:
krylov.eu
>Environment:
Linux localhost.localdomain 3.10.0-1160.119.1.el7.x86_64 #1 SMP Tue Jun 4 14:43:51 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
>Description:
x11/qt6-qtbase does not build on CentOS 7 due to as(1) supporting VAES instructions only since binutils 2.30+. When fixed, it installs an extra file on Linux. 
>How-To-Repeat:
bmake -C x11/qt6-qtbase bin-install
>Fix:
Index: x11/qt6-qtbase/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt6-qtbase/Makefile,v
retrieving revision 1.36
diff -p -u -r1.36 Makefile
--- x11/qt6-qtbase/Makefile	26 Jun 2024 16:40:58 -0000	1.36
+++ x11/qt6-qtbase/Makefile	2 Aug 2024 07:19:01 -0000
@@ -221,6 +221,16 @@ PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Te
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Widgets.pc
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Xml.pc
 
+# Newer gas from binutils 2.30+ is required for VAES instructions.
+.if ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "Linux"
+QT6_GAS_VERSION!=	\
+	( env LC_ALL=C as --version 2>&1 | ${AWK} '/GNU assembler version/ {print $$4}') 2>/dev/null || ${ECHO} 0
+.  if ${QT6_GAS_VERSION} != "0" && !(${QT6_GAS_VERSION:M2.[3-9][0-9]*} || ${QT6_GAS_VERSION:M[3-9]*})
+.include "../../devel/binutils/buildlink3.mk"
+.include "../../devel/binutils/override-as.mk"
+.  endif
+.endif
+
 .include "../../devel/wayland/platform.mk"
 
 .include "../../archivers/brotli/buildlink3.mk"
Index: x11/qt6-qtbase/PLIST.Linux
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt6-qtbase/PLIST.Linux,v
retrieving revision 1.4
diff -p -u -r1.4 PLIST.Linux
--- x11/qt6-qtbase/PLIST.Linux	20 Nov 2023 10:45:36 -0000	1.4
+++ x11/qt6-qtbase/PLIST.Linux	2 Aug 2024 07:19:01 -0000
@@ -1,6 +1,7 @@
 @comment $NetBSD: PLIST.Linux,v 1.4 2023/11/20 10:45:36 nia Exp $
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/minimum-linux_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_inotify_p.h
+qt6/include/QtCore/${PKGVERSION}/QtCore/private/qfutex_linux_p.h
 qt6/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_static_p.h
 qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/devicehandlerlist_p.h
 qt6/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h