pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/vte3



Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Apr 13 01:24:33 UTC 2022

Modified Files:
        pkgsrc/x11/vte3: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/x11/vte3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/vte3/Makefile
diff -u pkgsrc/x11/vte3/Makefile:1.50 pkgsrc/x11/vte3/Makefile:1.51
--- pkgsrc/x11/vte3/Makefile:1.50       Sun Apr 10 22:14:50 2022
+++ pkgsrc/x11/vte3/Makefile    Wed Apr 13 01:24:33 2022
@@ -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



Home | Main Index | Thread Index | Old Index