From 3f98c8ef215ef31b756225576a0f5f3d93593417 Mon Sep 17 00:00:00 2001 From: gutteridge Date: Wed, 13 Apr 2022 01:24:33 +0000 Subject: vte3: fix GCC binary package dependency for NetBSD < 9.99.82 This involves a bit of a kludge to deal with how GCC from pkgsrc ends up linking. This is obviously not ideal, and is part of a broader topic that needs revisiting. --- x11/vte3/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'x11') diff --git a/x11/vte3/Makefile b/x11/vte3/Makefile index eff5ed1e514..34920b1699f 100644 --- a/x11/vte3/Makefile +++ b/x11/vte3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2022/04/10 22:14:50 gutteridge Exp $ +# $NetBSD: Makefile,v 1.51 2022/04/13 01:24:33 gutteridge Exp $ DISTNAME= vte-0.68.0 PKGNAME= ${DISTNAME:S/vte/vte3/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/} GITHUB_PROJECT= vte @@ -21,6 +21,17 @@ USE_LANGUAGES= c c++20 # for c++20 GCC_REQD+= 10 +.include "../../mk/bsd.prefs.mk" + +# This package will link against libstdc++.so from the pkgsrc GCC when the +# base OS GCC doesn't meet the minimum requirement. Thus we do this so the +# appropriate gcc-libs package will be captured as a dependency, otherwise +# binary packages will be broken. +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099982 +USE_PKGSRC_GCC= yes +USE_PKGSRC_GCC_RUNTIME= yes +.endif + # Otherwise, this will fail on Linux distributions that don't # have libsystemd. MESON_ARGS+= -D_systemd=false -- cgit v1.2.3