Wed Jul 19 22:45:56 2023 UTC ()
qt5-*: remove another ld(1) option for Darwin


(tnn)
diff -r1.51 -r1.52 pkgsrc/x11/qt5-qtbase/Makefile.common
cvs diff -r1.51 -r1.52 pkgsrc/x11/qt5-qtbase/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile.common 2023/07/19 22:08:05 1.51
+++ pkgsrc/x11/qt5-qtbase/Makefile.common 2023/07/19 22:45:56 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.51 2023/07/19 22:08:05 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.52 2023/07/19 22:45:56 tnn Exp $
2# used by x11/qt5-mysql/Makefile 2# used by x11/qt5-mysql/Makefile
3# used by x11/qt5-odbc/Makefile 3# used by x11/qt5-odbc/Makefile
4# used by x11/qt5-psql/Makefile 4# used by x11/qt5-psql/Makefile
5# used by x11/qt5-qtbase/Makefile 5# used by x11/qt5-qtbase/Makefile
6# used by x11/qt5-qtcharts/Makefile 6# used by x11/qt5-qtcharts/Makefile
7# used by x11/qt5-qtconnectivity/Makefile 7# used by x11/qt5-qtconnectivity/Makefile
8# used by x11/qt5-qtdeclarative/Makefile 8# used by x11/qt5-qtdeclarative/Makefile
9# used by x11/qt5-qtdoc/Makefile 9# used by x11/qt5-qtdoc/Makefile
10# used by x11/qt5-qtgraphicaleffects/Makefile 10# used by x11/qt5-qtgraphicaleffects/Makefile
11# used by x11/qt5-qtimageformats/Makefile 11# used by x11/qt5-qtimageformats/Makefile
12# used by x11/qt5-qtlocation/Makefile 12# used by x11/qt5-qtlocation/Makefile
13# used by x11/qt5-qtmacextras/Makefile 13# used by x11/qt5-qtmacextras/Makefile
14# used by x11/qt5-qtmultimedia/Makefile 14# used by x11/qt5-qtmultimedia/Makefile
@@ -46,28 +46,29 @@ USE_TOOLS+= gmake perl:build pkg-config @@ -46,28 +46,29 @@ USE_TOOLS+= gmake perl:build pkg-config
46 46
47# Avoid failures to due 'register' usage in X11 headers. 47# Avoid failures to due 'register' usage in X11 headers.
48CFLAGS+= -Wno-register 48CFLAGS+= -Wno-register
49 49
50# wcstof(3) etc. is used in C++ code. 50# wcstof(3) etc. is used in C++ code.
51CFLAGS.NetBSD+= -D_NETBSD_SOURCE 51CFLAGS.NetBSD+= -D_NETBSD_SOURCE
52 52
53# include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type 53# include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type
54CXXFLAGS.SunOS+= -D_Noreturn="" 54CXXFLAGS.SunOS+= -D_Noreturn=""
55 55
56# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. 56# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
57BUILDLINK_TRANSFORM+= rm:-Wundef 57BUILDLINK_TRANSFORM+= rm:-Wundef
58 58
59# ld: unknown option: -O1 59# Remove unknown ld(1) options
60BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,-O1 60BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,-O1
 61BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--no-undefined
61 62
62MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 63MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
63PLIST_VARS+= notdarwin 64PLIST_VARS+= notdarwin
64.if ${OPSYS} != "Darwin" 65.if ${OPSYS} != "Darwin"
65PLIST.notdarwin= yes 66PLIST.notdarwin= yes
66.endif 67.endif
67 68
68# avoid creating a .qt directory in the users home directory 69# avoid creating a .qt directory in the users home directory
69SCRIPTS_ENV+= HOME=${WRKDIR} 70SCRIPTS_ENV+= HOME=${WRKDIR}
70 71
71.if "${PKGPATH}" != "x11/qt5-qtbase" && "${PKGPATH}" != "x11/qt5-odbc" && \ 72.if "${PKGPATH}" != "x11/qt5-qtbase" && "${PKGPATH}" != "x11/qt5-odbc" && \
72 "${PKGPATH}" != "x11/qt5-mysql" && "${PKGPATH}" != "x11/qt5-psql" && \ 73 "${PKGPATH}" != "x11/qt5-mysql" && "${PKGPATH}" != "x11/qt5-psql" && \
73 "${PKGPATH}" != "x11/qt5-qtwayland" 74 "${PKGPATH}" != "x11/qt5-qtwayland"