[arch-commits] Commit in nodejs-lts-erbium/repos/community-x86_64 (3 files)
Bruno Pagani
archange at archlinux.org
Tue Mar 16 10:31:24 UTC 2021
Date: Tuesday, March 16, 2021 @ 10:31:24
Author: archange
Revision: 891791
archrelease: copy trunk to community-x86_64
Added:
nodejs-lts-erbium/repos/community-x86_64/PKGBUILD
(from rev 891790, nodejs-lts-erbium/trunk/PKGBUILD)
nodejs-lts-erbium/repos/community-x86_64/python3.patch
(from rev 891790, nodejs-lts-erbium/trunk/python3.patch)
Deleted:
nodejs-lts-erbium/repos/community-x86_64/PKGBUILD
---------------+
PKGBUILD | 132 ++++++++++++++++++++++++++------------------------------
python3.patch | 58 ++++++++++++++++++++++++
2 files changed, 120 insertions(+), 70 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-16 10:30:53 UTC (rev 891790)
+++ PKGBUILD 2021-03-16 10:31:24 UTC (rev 891791)
@@ -1,70 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-# Contributor: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=nodejs-lts-erbium
-pkgver=12.21.0
-pkgrel=1
-pkgdesc="Evented I/O for V8 javascript (LTS release: Erbium)"
-arch=(x86_64)
-url="https://nodejs.org/"
-license=(MIT)
-depends=(openssl zlib icu libuv c-ares brotli libnghttp2) # http-parser
-makedepends=(python2 procps-ng)
-optdepends=('npm: nodejs package manager')
-provides=("nodejs=$pkgver")
-conflicts=(nodejs)
-source=("${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz")
-# https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc
-sha256sums=(052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d)
-validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 # Myles Borins <mylesborins at google.com>
- 77984A986EBC2AA786BC0F66B01FBB92821C587A # Gibson Fahnestock <gibfahn at gmail.com>
- B9AE9905FFD7803F25714661B63B535A4C206CA9 # Evan Lucas <evanlucas at me.com>
- DD8F2338BAE7501E3DD5AC78C273792F7D83545D # Rod Vagg <rod at vagg.org>
- B9E2F5981AA6E0CD28160D9FF13993A75599653C # Shelley Vohr <shelley.vohr at gmail.com>
- 4ED778F539E3634C779C87C6D7062848A1AB005C # Beth Griggs <Bethany.Griggs at uk.ibm.com>
- C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C) # Richard Lau <rlau at redhat.com>
-
-prepare() {
- cd node-v${pkgver}
- echo 'Fixing for python2 name'
- find -type f -exec sed \
- -e 's_^#!/usr/bin/env python$_&2_' \
- -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
- -e 's_^#!/usr/bin/python$_&2_' \
- -e 's_^\( *exec \+\)python\( \+.*\)$_\1python2\2_'\
- -e 's_^\(.*\)python\( \+-c \+.*\)$_\1python2\2_'\
- -e "s_'python'_'python2'_" -i {} +
- find test/ -type f -exec sed 's_python _python2 _' -i {} +
- sed -i 's_ch.spawn(python,_ch.spawn(python2,_g' test/parallel/test-child-process-set-blocking.js
-}
-
-build() {
- cd node-v${pkgver}
-
- export PYTHON=python2
- ./configure \
- --prefix=/usr \
- --with-intl=system-icu \
- --without-npm \
- --shared-openssl \
- --shared-zlib \
- --shared-libuv \
- --experimental-http-parser \
- --shared-cares \
- --shared-brotli \
- --shared-nghttp2
- #--shared-http-parser \
-
- make
-}
-
-check() {
- cd node-v${pkgver}
- make test-only
-}
-
-package() {
- cd node-v${pkgver}
- make DESTDIR="${pkgdir}" install
- install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
-}
Copied: nodejs-lts-erbium/repos/community-x86_64/PKGBUILD (from rev 891790, nodejs-lts-erbium/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-16 10:31:24 UTC (rev 891791)
@@ -0,0 +1,62 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=nodejs-lts-erbium
+pkgver=12.21.0
+pkgrel=2
+pkgdesc="Evented I/O for V8 javascript (LTS release: Erbium)"
+arch=(x86_64)
+url="https://nodejs.org/"
+license=(MIT)
+depends=(openssl zlib icu libuv c-ares brotli libnghttp2) # http-parser
+makedepends=(python procps-ng)
+optdepends=('npm: nodejs package manager')
+provides=("nodejs=$pkgver")
+conflicts=(nodejs)
+source=("${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz"
+ python3.patch)
+# https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc
+sha256sums=(052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d
+ 20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d)
+validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 # Myles Borins <mylesborins at google.com>
+ 77984A986EBC2AA786BC0F66B01FBB92821C587A # Gibson Fahnestock <gibfahn at gmail.com>
+ B9AE9905FFD7803F25714661B63B535A4C206CA9 # Evan Lucas <evanlucas at me.com>
+ DD8F2338BAE7501E3DD5AC78C273792F7D83545D # Rod Vagg <rod at vagg.org>
+ B9E2F5981AA6E0CD28160D9FF13993A75599653C # Shelley Vohr <shelley.vohr at gmail.com>
+ 4ED778F539E3634C779C87C6D7062848A1AB005C # Beth Griggs <Bethany.Griggs at uk.ibm.com>
+ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C) # Richard Lau <rlau at redhat.com>
+
+prepare() {
+ cd node-v${pkgver}
+ patch -Np1 -i ../python3.patch
+}
+
+build() {
+ cd node-v${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --with-intl=system-icu \
+ --without-npm \
+ --shared-openssl \
+ --shared-zlib \
+ --shared-libuv \
+ --experimental-http-parser \
+ --shared-cares \
+ --shared-brotli \
+ --shared-nghttp2
+ #--shared-http-parser \
+
+ make
+}
+
+check() {
+ cd node-v${pkgver}
+ make test-only
+}
+
+package() {
+ cd node-v${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
Copied: nodejs-lts-erbium/repos/community-x86_64/python3.patch (from rev 891790, nodejs-lts-erbium/trunk/python3.patch)
===================================================================
--- python3.patch (rev 0)
+++ python3.patch 2021-03-16 10:31:24 UTC (rev 891791)
@@ -0,0 +1,58 @@
+diff --git a/configure b/configure
+index 9156e13f..630ef657 100755
+--- a/configure
++++ b/configure
+@@ -1,28 +1,37 @@
+ #!/bin/sh
+
+-# Locate python2 interpreter and re-execute the script. Note that the
+-# mix of single and double quotes is intentional, as is the fact that
+-# the ] goes on a new line.
++# Locate an acceptable python interpreter and then re-execute the script.
++# Note that the mix of single and double quotes is intentional,
++# as is the fact that the ] goes on a new line.
++# When a 'which' call is made for a specific version of Python on Travis CI,
++# pyenv will alert which shims are available and then will fail the build.
+ _=[ 'exec' '/bin/sh' '-c' '''
++test ${TRAVIS} && exec python "$0" "$@" # workaround for pyenv on Travis CI
++which python3.9 >/dev/null && exec python3.9 "$0" "$@"
++which python3.8 >/dev/null && exec python3.8 "$0" "$@"
++which python3.7 >/dev/null && exec python3.7 "$0" "$@"
++which python3.6 >/dev/null && exec python3.6 "$0" "$@"
++which python3.5 >/dev/null && exec python3.5 "$0" "$@"
++which python3 >/dev/null && exec python3 "$0" "$@"
+ which python2.7 >/dev/null && exec python2.7 "$0" "$@"
+-which python2 >/dev/null && exec python2 "$0" "$@"
+ exec python "$0" "$@"
+ ''' "$0" "$@"
+ ]
+ del _
+
+ import sys
+-from distutils.spawn import find_executable as which
+-if sys.version_info[:2] != (2, 7):
+- sys.stderr.write('Please use Python 2.7')
++from distutils.spawn import find_executable
+
+- python2 = which('python2') or which('python2.7')
+-
+- if python2:
+- sys.stderr.write(':\n\n')
+- sys.stderr.write(' ' + python2 + ' ' + ' '.join(sys.argv))
+-
+- sys.stderr.write('\n')
++print('Node configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
++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:
++ python_cmds = ['python{0}.{1}'.format(*vers) for vers in acceptable_pythons]
++ sys.stderr.write('Please use {0}.\n'.format(' or '.join(python_cmds)))
++ for python_cmd in python_cmds:
++ python_cmd_path = find_executable(python_cmd)
++ if python_cmd_path and 'pyenv/shims' not in python_cmd_path:
++ sys.stderr.write('\t{0} {1}\n'.format(python_cmd_path,
++ ' '.join(sys.argv[:1])))
+ sys.exit(1)
+-
+-import configure
More information about the arch-commits
mailing list