Wed Apr 13 01:24:33 2022 UTC ()
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.


(gutteridge)
diff -r1.50 -r1.51 pkgsrc/x11/vte3/Makefile
cvs diff -r1.50 -r1.51 pkgsrc/x11/vte3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/vte3/Makefile 2022/04/10 22:14:50 1.50
+++ pkgsrc/x11/vte3/Makefile 2022/04/13 01:24:33 1.51
@@ -1,36 +1,47 @@ @@ -1,36 +1,47 @@
1# $NetBSD: Makefile,v 1.50 2022/04/10 22:14:50 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.51 2022/04/13 01:24:33 gutteridge Exp $
2 2
3DISTNAME= vte-0.68.0 3DISTNAME= vte-0.68.0
4PKGNAME= ${DISTNAME:S/vte/vte3/} 4PKGNAME= ${DISTNAME:S/vte/vte3/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/}
8GITHUB_PROJECT= vte 8GITHUB_PROJECT= vte
9GITHUB_TAG= ${PKGVERSION_NOREV} 9GITHUB_TAG= ${PKGVERSION_NOREV}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.gnome.org/ 12HOMEPAGE= https://www.gnome.org/
13COMMENT= Terminal widget with improved accessibility and I18N support 13COMMENT= Terminal widget with improved accessibility and I18N support
14LICENSE= gnu-lgpl-v2 14LICENSE= gnu-lgpl-v2
15 15
16PKGCONFIG_OVERRIDE_STAGE= post-configure 16PKGCONFIG_OVERRIDE_STAGE= post-configure
17PKGCONFIG_OVERRIDE+= output/meson-private/vte-2.91.pc 17PKGCONFIG_OVERRIDE+= output/meson-private/vte-2.91.pc
18 18
19USE_TOOLS+= msgfmt pkg-config bash 19USE_TOOLS+= msgfmt pkg-config bash
20USE_LANGUAGES= c c++20 20USE_LANGUAGES= c c++20
21# for c++20 21# for c++20
22GCC_REQD+= 10 22GCC_REQD+= 10
23 23
 24.include "../../mk/bsd.prefs.mk"
 25
 26# This package will link against libstdc++.so from the pkgsrc GCC when the
 27# base OS GCC doesn't meet the minimum requirement. Thus we do this so the
 28# appropriate gcc-libs package will be captured as a dependency, otherwise
 29# binary packages will be broken.
 30.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099982
 31USE_PKGSRC_GCC= yes
 32USE_PKGSRC_GCC_RUNTIME= yes
 33.endif
 34
24# Otherwise, this will fail on Linux distributions that don't 35# Otherwise, this will fail on Linux distributions that don't
25# have libsystemd. 36# have libsystemd.
26MESON_ARGS+= -D_systemd=false 37MESON_ARGS+= -D_systemd=false
27 38
28CONF_FILES+= ${PREFIX}/share/examples/profile.d/vte.sh \ 39CONF_FILES+= ${PREFIX}/share/examples/profile.d/vte.sh \
29 ${PKG_SYSCONFDIR}/profile.d/vte.sh 40 ${PKG_SYSCONFDIR}/profile.d/vte.sh
30 41
31CONF_FILES+= ${PREFIX}/share/examples/profile.d/vte.csh \ 42CONF_FILES+= ${PREFIX}/share/examples/profile.d/vte.csh \
32 ${PKG_SYSCONFDIR}/profile.d/vte.csh 43 ${PKG_SYSCONFDIR}/profile.d/vte.csh
33 44
34MAKE_DIRS+= ${PKG_SYSCONFDIR}/profile.d 45MAKE_DIRS+= ${PKG_SYSCONFDIR}/profile.d
35 46
36PYTHON_FOR_BUILD_ONLY= tool 47PYTHON_FOR_BUILD_ONLY= tool