CVS commit: pkgsrc/x11/qt6-qtbase

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Nov  6 19:46:46 UTC 2023

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile PLIST.SunOS

Log Message:
qt6-qtbase: Various SunOS fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qt6-qtbase/PLIST.SunOS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.17 pkgsrc/x11/qt6-qtbase/Makefile:1.18
--- pkgsrc/x11/qt6-qtbase/Makefile:1.17 Tue Oct 31 19:56:48 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile      Mon Nov  6 19:46:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/10/31 19:56:48 adam Exp $
+# $NetBSD: Makefile,v 1.18 2023/11/06 19:46:46 jperkin Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -102,10 +102,17 @@ LDFLAGS+=                 -lexecinfo
 .  endif
 LDFLAGS.FreeBSD+=              -lutil
 .elif ${OPSYS} == "SunOS"
-PLIST_VARS+=   inotify
-.  if exists(/usr/include/sys/inotify.h)
-PLIST.inotify= yes
-.  endif
+CONFIGURE_ARGS+=               -no-inotify
+.endif
+
+#
+# Qt uses FP16 intrinsics, but GCC isn't inserting libgcc due to it being in
+# a shared library.  This isn't ideal but adding it via the usual variables
+# is proving to be difficult as they are placed before the object files.
+#
+.if ${OPSYS} == "SunOS"
+CWRAPPERS_APPEND.cc+=  -lgcc
+CWRAPPERS_APPEND.cxx+= -lgcc
 .endif
 
 REPLACE_PERL+=         libexec/syncqt.pl

Index: pkgsrc/x11/qt6-qtbase/PLIST.SunOS
diff -u pkgsrc/x11/qt6-qtbase/PLIST.SunOS:1.2 pkgsrc/x11/qt6-qtbase/PLIST.SunOS:1.3
--- pkgsrc/x11/qt6-qtbase/PLIST.SunOS:1.2       Sat Apr 15 11:00:42 2023
+++ pkgsrc/x11/qt6-qtbase/PLIST.SunOS   Mon Nov  6 19:46:46 2023
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.SunOS,v 1.2 2023/04/15 11:00:42 nros Exp $
-${PLIST.inotify}qt6/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_inotify_p.h
+@comment $NetBSD: PLIST.SunOS,v 1.3 2023/11/06 19:46:46 jperkin Exp $
 qt6/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_dummy_p.h