jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nodejs: update to 14.13.1.

Browse source 
patch is needed for configure script to support python3.9, taken from
master, droppable in next release.

Closes: #25539 [via git-merge-pr]
This commit is contained in:
fosslinux 2020-10-12 21:03:37 +11:00 committed by Andrew J. Hesford
parent 458f2a2952
commit 26be36e337
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
srcpkgs/nodejs/patches/python3.9.patch Normal file
View file

@ -0,0 +1,35 @@
From c8b950a7afcc3e7c222bb94fabccc7e2fb447457 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Tue, 6 Oct 2020 17:51:24 +0200
Subject: [PATCH] build: gitHub actions: Python 3.9 and actions/setup-python@v2
PR-URL: https://github.com/nodejs/node/pull/35521
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Modified by fosslinux to remove .github stuff.
diff --git configure configure
index 7e8c4cff832..07581d9c5a4 100755
--- configure
+++ configure
@@ -5,6 +5,7 @@
# as is the fact that the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient
+command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
@@ -19,7 +20,7 @@ import sys
from distutils.spawn import find_executable
print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
+acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
if sys.version_info[:2] in acceptable_pythons:
import configure
else:

6
srcpkgs/nodejs/template
View file

@ -1,6 +1,6 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.13.0
version=14.13.1
revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@ -8,7 +8,7 @@ hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
makedepends="zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=8538b2e76aa06ee0e6eb1c118426c3c5ca53b2e49d66591738eacf76e89edd61
checksum=f0080d3284ea1585e255a3f459ce151e8106a33f4ce8bed0da15ff99c6a082a5
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"