CVS commit: pkgsrc/lang/nodejs/patches

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov  2 13:18:41 UTC 2023

Added Files:
        pkgsrc/lang/nodejs/patches: patch-configure.py
            patch-tools_gyp_pylib_gyp_input.py

Log Message:
nodejs: add missing patches


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/lang/nodejs/patches/patch-configure.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_input.py

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

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-configure.py
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-configure.py:1.3
--- /dev/null   Thu Nov  2 13:18:41 2023
+++ pkgsrc/lang/nodejs/patches/patch-configure.py       Thu Nov  2 13:18:41 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-configure.py,v 1.3 2023/11/02 13:18:41 adam Exp $
+
+Use packaging instead of deprecated distutils.
+
+--- configure.py.orig  2023-11-02 12:01:17.555637132 +0000
++++ configure.py
+@@ -14,7 +14,7 @@ import bz2
+ import io
+ from pathlib import Path
+ 
+-from distutils.version import StrictVersion
++from packaging.version import Version
+ 
+ # If not run from node/, cd to node/.
+ os.chdir(Path(__file__).parent)
+@@ -1565,10 +1565,10 @@ def configure_openssl(o):
+     # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
+     # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
+     openssl110_asm_supported = \
+-      ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
+-      ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
+-      ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
+-      ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
++      ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
++      ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
++      ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
++      ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
+ 
+     if is_x86 and not openssl110_asm_supported:
+       error('''Did not find a new enough assembler, install one or build with

Index: pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_input.py
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_input.py:1.1
--- /dev/null   Thu Nov  2 13:18:41 2023
+++ pkgsrc/lang/nodejs/patches/patch-tools_gyp_pylib_gyp_input.py       Thu Nov  2 13:18:41 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-tools_gyp_pylib_gyp_input.py,v 1.1 2023/11/02 13:18:41 adam Exp $
+
+Use packaging instead of deprecated distutils.
+
+--- tools/gyp/pylib/gyp/input.py.orig  2023-11-02 12:06:18.318323105 +0000
++++ tools/gyp/pylib/gyp/input.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import threading
+ import traceback
+-from distutils.version import StrictVersion
++from packaging.version import Version
+ from gyp.common import GypError
+ from gyp.common import OrderedSet
+ 
+@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_
+         else:
+             ast_code = compile(cond_expr_expanded, "<string>", "eval")
+             cached_conditions_asts[cond_expr_expanded] = ast_code
+-        env = {"__builtins__": {}, "v": StrictVersion}
++        env = {"__builtins__": {}, "v": Version}
+         if eval(ast_code, env, variables):
+             return true_dict
+         return false_dict