CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 27 18:47:07 UTC 2022

Modified Files:
        pkgsrc/devel/gyp: Makefile
        pkgsrc/inputmethod/fcitx5-mozc: Makefile.common

Log Message:
gyp: python 3.10 support breaks python 2.7 support; disable it


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/gyp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/inputmethod/fcitx5-mozc/Makefile.common

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

Modified files:

Index: pkgsrc/devel/gyp/Makefile
diff -u pkgsrc/devel/gyp/Makefile:1.25 pkgsrc/devel/gyp/Makefile:1.26
--- pkgsrc/devel/gyp/Makefile:1.25      Thu Jan 27 18:42:15 2022
+++ pkgsrc/devel/gyp/Makefile   Thu Jan 27 18:47:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/01/27 18:42:15 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/01/27 18:47:07 wiz Exp $
 
 GIT_VERSION=   20210830.d6c5dd51dc3a60bf4ff32a5256713690a1a10376
 DIST_VERSION=  0.1
@@ -18,6 +18,8 @@ EGG_NAME=     gyp-${DIST_VERSION}
 
 USE_PKG_RESOURCES=     yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 # REPLACE_PYTHON settings farmed out due to size...
 .include "Makefile.replace-python"
 

Index: pkgsrc/inputmethod/fcitx5-mozc/Makefile.common
diff -u pkgsrc/inputmethod/fcitx5-mozc/Makefile.common:1.3 pkgsrc/inputmethod/fcitx5-mozc/Makefile.common:1.4
--- pkgsrc/inputmethod/fcitx5-mozc/Makefile.common:1.3  Wed Apr 21 11:42:03 2021
+++ pkgsrc/inputmethod/fcitx5-mozc/Makefile.common      Thu Jan 27 18:47:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2021/04/21 11:42:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2022/01/27 18:47:07 wiz Exp $
 # used by inputmethod/fcitx5-mozc/Makefile
 
 # Find version number in src/data/version/mozc_version_template.bzl
@@ -24,6 +24,8 @@ USE_LANGUAGES=        c c++
 USE_TOOLS+=    gmake pkg-config
 GCC_REQD+=     4.7     # for c++11
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 OPENSSL_CFLAGS=                -I${BUILDLINK_PREFIX.openssl}/include
 OPENSSL_INC=           -I${BUILDLINK_PREFIX.openssl}/include
 OPENSSL_LDFLAGS=       -L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto