*: Re-apply SunOS linker argument removals.

These are currently duplicated in mk/platform/SunOS.mk but the generic
removals will be removed soon in favour of per-package removals, due to
flags getting leaked into installed files.

6 files changed, 19 insertions, 6 deletions

diff --git a/x11/clipit/Makefile b/x11/clipit/Makefile
index eb6f148dfa6..65dd9d9c40a 100644
--- a/x11/clipit/Makefile
+++ b/x11/clipit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2022/08/11 05:09:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.30 2022/11/21 18:20:46 jperkin Exp $
 
 DISTNAME=	clipit-1.4.5
 PKGREVISION=	2
@@ -23,6 +23,8 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--disable-glibtest
 CONFIGURE_ARGS+=	--with-gtk3
 
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--as-needed
+
 BUILD_DEFS+=	PKG_SYSCONFBASE
 
 EGDIR=		${PREFIX}/share/examples/clipit
diff --git a/x11/gtk4/Makefile b/x11/gtk4/Makefile
index 49aa694f858..6b529f9b19f 100644
--- a/x11/gtk4/Makefile
+++ b/x11/gtk4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/10/26 10:32:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/11/21 18:20:46 jperkin Exp $
 
 DISTNAME=	gtk-4.8.1
 PKGNAME=	${DISTNAME:S/gtk/gtk4/}
@@ -36,6 +36,8 @@ PKGCONFIG_OVERRIDE+=	output/meson-private/gtk4-unix-print.pc
 
 PKGCONFIG_OVERRIDE_STAGE=	post-configure
 
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--export-dynamic
+
 PLIST_VARS+=		dylib no-dylib
 .if ${SHLIB_TYPE} == "dylib"
 PLIST.dylib=		yes
diff --git a/x11/hsetroot/Makefile b/x11/hsetroot/Makefile
index 1aedfe77910..2bff74f6c3a 100644
--- a/x11/hsetroot/Makefile
+++ b/x11/hsetroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/05/18 10:26:25 nia Exp $
+# $NetBSD: Makefile,v 1.28 2022/11/21 18:20:46 jperkin Exp $
 
 DISTNAME=	hsetroot-1.0.5
 CATEGORIES=	x11
@@ -11,6 +11,8 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake pkg-config
 
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--no-as-needed
+
 INSTALLATION_DIRS+=	bin
 
 do-install:
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 8e5820a03d6..80dfd271656 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.53 2020/05/02 13:53:09 rillig Exp $
+# $NetBSD: Makefile.common,v 1.54 2022/11/21 18:20:46 jperkin Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -148,6 +148,8 @@ SUBST_SED.lt+=		-e 's,$$$${first(QMAKE_EXT_OBJ)},.lo,'
 CXXFLAGS+=		-DQ_INLINE_TEMPLATES=inline
 .endif
 
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--gc-sections
+
 # Remove files with portability issues, thereby ~proving they are not used in the build.
 post-extract:
 	rm ${WRKSRC}/src/3rdparty/webkit/Source/JavaScriptCore/gyp/generate-dtrace-header.sh
diff --git a/x11/xcb-imdkit/Makefile b/x11/xcb-imdkit/Makefile
index 3cb6199aa8a..00ffedfc959 100644
--- a/x11/xcb-imdkit/Makefile
+++ b/x11/xcb-imdkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/02/15 15:05:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2022/11/21 18:20:46 jperkin Exp $
 
 DISTNAME=	xcb-imdkit-1.0.2
 CATEGORIES=	x11
@@ -18,6 +18,8 @@ USE_LANGUAGES+=	c c++
 
 PKGCONFIG_OVERRIDE+=	src/xcb-imdkit.pc.in
 
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--as-needed
+
 .include "../../devel/uthash/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xcb-util/buildlink3.mk"
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index a655b87ebcc..7a2339e54b4 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2022/08/11 05:09:36 gutteridge Exp $
+# $NetBSD: Makefile,v 1.46 2022/11/21 18:20:46 jperkin Exp $
 
 VERSION=	2.7.1
 DISTNAME=	xfce4-whiskermenu-plugin-${VERSION}
@@ -16,6 +16,9 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config msgfmt perl intltool
 
+BUILDLINK_TRANSFORM.SunOS+=     rm:-Wl,--as-needed
+BUILDLINK_TRANSFORM.SunOS+=     rm:-Wl,-O1
+
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../x11/xfce4-garcon/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"