Sun Jan 8 08:13:31 2023 UTC ()
qt6-qtbase: fix build failure on NetBSD/i386.

Closes PR/57151.
No PKGREVISION bump because buildable ports are not affected.


(tsutsui)
diff -r1.25 -r1.26 pkgsrc/x11/qt6-qtbase/Makefile.common
cvs diff -r1.25 -r1.26 pkgsrc/x11/qt6-qtbase/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt6-qtbase/Makefile.common 2022/12/01 21:26:00 1.25
+++ pkgsrc/x11/qt6-qtbase/Makefile.common 2023/01/08 08:13:31 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.25 2022/12/01 21:26:00 nros Exp $ 1# $NetBSD: Makefile.common,v 1.26 2023/01/08 08:13:31 tsutsui Exp $
2# used by audio/qt6-qtspeech/Makefile 2# used by audio/qt6-qtspeech/Makefile
3# used by databases/qt6-odbc/Makefile 3# used by databases/qt6-odbc/Makefile
4# used by databases/qt6-psql/Makefile 4# used by databases/qt6-psql/Makefile
5# used by devel/qt6-qt5compat/Makefile 5# used by devel/qt6-qt5compat/Makefile
6# used by devel/qt6-qttools/Makefile 6# used by devel/qt6-qttools/Makefile
7# used by graphics/qt6-qt3d/Makefile 7# used by graphics/qt6-qt3d/Makefile
8# used by graphics/qt6-qtcharts/Makefile 8# used by graphics/qt6-qtcharts/Makefile
9# used by graphics/qt6-qtdatavis3d/Makefile 9# used by graphics/qt6-qtdatavis3d/Makefile
10# used by graphics/qt6-qtimageformats/Makefile 10# used by graphics/qt6-qtimageformats/Makefile
11# used by graphics/qt6-qtlottie/Makefile 11# used by graphics/qt6-qtlottie/Makefile
12# used by graphics/qt6-qtquick3d/Makefile 12# used by graphics/qt6-qtquick3d/Makefile
13# used by graphics/qt6-qtquicktimeline/Makefile 13# used by graphics/qt6-qtquicktimeline/Makefile
14# used by graphics/qt6-qtshadertools/Makefile 14# used by graphics/qt6-qtshadertools/Makefile
@@ -25,26 +25,31 @@ @@ -25,26 +25,31 @@
25# used by x11/qt6-qtbase/Makefile 25# used by x11/qt6-qtbase/Makefile
26 26
27.include "../../meta-pkgs/qt6/Makefile.common" 27.include "../../meta-pkgs/qt6/Makefile.common"
28 28
29.include "../../mk/dlopen.buildlink3.mk" 29.include "../../mk/dlopen.buildlink3.mk"
30BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 30BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
31 31
32USE_LANGUAGES= c c++ 32USE_LANGUAGES= c c++
33USE_TOOLS+= cmake gmake perl:build pkg-config 33USE_TOOLS+= cmake gmake perl:build pkg-config
34 34
35# https://doc.qt.io/qt-6/supported-platforms.html 35# https://doc.qt.io/qt-6/supported-platforms.html
36GCC_REQD+= 9 36GCC_REQD+= 9
37 37
 38# required for -msse2
 39.if ${MACHINE_ARCH} == "i386"
 40CFLAGS+= -mstackrealign
 41.endif
 42
38# Avoid failures to due 'register' usage in X11 headers. 43# Avoid failures to due 'register' usage in X11 headers.
39CXXFLAGS+= -Wno-register 44CXXFLAGS+= -Wno-register
40 45
41# wcstof(3) etc. is used in C++ code. 46# wcstof(3) etc. is used in C++ code.
42CFLAGS.NetBSD+= -D_NETBSD_SOURCE 47CFLAGS.NetBSD+= -D_NETBSD_SOURCE
43 48
44# ld: undefined symbol qt_version_tag 49# ld: undefined symbol qt_version_tag
45CFLAGS.SunOS+= -DQT_NO_VERSION_TAGGING 50CFLAGS.SunOS+= -DQT_NO_VERSION_TAGGING
46 51
47# include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type 52# include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type
48CXXFLAGS.SunOS+= -D_Noreturn="" 53CXXFLAGS.SunOS+= -D_Noreturn=""
49 54
50# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. 55# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.