Update to 19.7.0
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher
parent
960b2f524d
commit
a35607a1c3
|
|
@ -1,4 +1,4 @@
|
|||
From dcfc1ddd79e6bf9c7d3066e7c9e466e51011adac Mon Sep 17 00:00:00 2001
|
||||
From 694be95b2b7f82ec1f053f652c6f297b3f521fb0 Mon Sep 17 00:00:00 2001
|
||||
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
||||
Date: Fri, 17 Apr 2020 12:59:44 +0200
|
||||
Subject: [PATCH] Disable running gyp on shared deps
|
||||
|
|
@ -10,7 +10,7 @@ Signed-off-by: rpm-build <rpm-build>
|
|||
2 files changed, 2 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 94013466239e9c43ddce5cebc7a8d0a4dc56db4f..8577570c95d20dcf8d3dfe5d9fe82c1f67b2d70a 100644
|
||||
index 830413fdba81da34a56b8a6aabfca3eacda1684d..21f7de35fa36183b30c6f996894b134f80421df4 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -169,7 +169,7 @@ with-code-cache test-code-cache:
|
||||
|
|
@ -19,10 +19,10 @@ index 94013466239e9c43ddce5cebc7a8d0a4dc56db4f..8577570c95d20dcf8d3dfe5d9fe82c1f
|
|||
out/Makefile: config.gypi common.gypi node.gyp \
|
||||
- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
|
||||
+ deps/llhttp/llhttp.gyp \
|
||||
deps/simdutf/simdutf.gyp \
|
||||
deps/simdutf/simdutf.gyp deps/ada/ada.gyp \
|
||||
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
|
||||
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
|
||||
@@ -1550,7 +1550,7 @@ CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+
|
||||
@@ -1556,7 +1556,7 @@ CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+
|
||||
|
||||
# Related CI job: node-test-linter
|
||||
lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs lint-yaml-build lint-yaml
|
||||
|
|
@ -32,10 +32,10 @@ index 94013466239e9c43ddce5cebc7a8d0a4dc56db4f..8577570c95d20dcf8d3dfe5d9fe82c1f
|
|||
exit 0 ; \
|
||||
else \
|
||||
diff --git a/node.gyp b/node.gyp
|
||||
index b0f132efd82edcd114612d25cd3316379b2097a4..f091b165cbb9efccbe16a6e595a32b311248939b 100644
|
||||
index 6d1b2bf36902cf54f33513873441c403c2e7ee3d..e5c1f696ffb14421df1a5626be6cf1c6738d870e 100644
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -420,23 +420,6 @@
|
||||
@@ -421,23 +421,6 @@
|
||||
],
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -293,6 +293,11 @@ echo "========================="
|
|||
echo "${UNDICI_VERSION}"
|
||||
echo "WASI-SDK: ${UNDICI_WASI_MAJOR}.${UNDICI_WASI_MINOR}"
|
||||
echo
|
||||
echo "ada"
|
||||
echo "========================="
|
||||
ADA_VERSION=$(grep -oP '(?<=#define ADA_VERSION ).*\"' node-v${version}/deps/ada/ada.h |sed -e 's/^"//' -e 's/"$//')
|
||||
echo "${ADA_VERSION}
|
||||
echo
|
||||
echo "Applying versions to spec template"
|
||||
|
||||
sed -e "s/@NODE_PKG_MAJOR@/${NODE_PKG_MAJOR}/g" \
|
||||
|
|
@ -322,6 +327,7 @@ sed -e "s/@NODE_PKG_MAJOR@/${NODE_PKG_MAJOR}/g" \
|
|||
-e "s/@UNDICI_VERSION@/${UNDICI_VERSION}/g" \
|
||||
-e "s/@UNDICI_WASI_MAJOR@/${UNDICI_WASI_MAJOR}/g" \
|
||||
-e "s/@UNDICI_WASI_MINOR@/${UNDICI_WASI_MINOR}/g" \
|
||||
-e "s/@ADA_VERSION@/${ADA_VERSION}/g" \
|
||||
${SCRIPT_DIR}/packaging/nodejs.spec.in \
|
||||
> ${SCRIPT_DIR}/nodejs${NODE_PKG_MAJOR}.spec
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@
|
|||
# than a Fedora release lifecycle.
|
||||
%global nodejs_epoch 1
|
||||
%global nodejs_major 19
|
||||
%global nodejs_minor 6
|
||||
%global nodejs_patch 1
|
||||
%global nodejs_minor 7
|
||||
%global nodejs_patch 0
|
||||
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
|
||||
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
|
||||
%global nodejs_soversion 111
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
# c-ares - from deps/cares/include/ares_version.h
|
||||
# https://github.com/nodejs/node/pull/9332
|
||||
%global c_ares_version 1.18.1
|
||||
%global c_ares_version 1.19.0
|
||||
|
||||
# llhttp - from deps/llhttp/include/llhttp.h
|
||||
%global llhttp_version 8.1.0
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
|
||||
# npm - from deps/npm/package.json
|
||||
%global npm_epoch 1
|
||||
%global npm_version 9.4.0
|
||||
%global npm_version 9.5.0
|
||||
|
||||
# In order to avoid needing to keep incrementing the release version for the
|
||||
# main package forever, we will just construct one for npm that is guaranteed
|
||||
|
|
@ -158,7 +158,7 @@ Source100: nodejs-sources.sh
|
|||
# These are generated by nodejs-sources.sh
|
||||
Source101: cjs-module-lexer-1.2.2-stripped.tar.gz
|
||||
Source102: wasi-sdk-11.0-linux.tar.gz
|
||||
Source111: undici-5.19.1-stripped.tar.gz
|
||||
Source111: undici-5.20.0-stripped.tar.gz
|
||||
Source112: wasi-sdk-14.0-linux.tar.gz
|
||||
|
||||
# Disable running gyp on bundled deps we don't use
|
||||
|
|
|
|||
|
|
@ -129,6 +129,9 @@
|
|||
# histogram_c - assumed from timestamps
|
||||
%global histogram_version 0.9.7
|
||||
|
||||
# ada URL parser
|
||||
%global ada_version @ADA_VERSION@
|
||||
|
||||
|
||||
Name: nodejs@NODE_PKG_MAJOR@
|
||||
Epoch: %{nodejs_epoch}
|
||||
|
|
@ -301,6 +304,10 @@ Provides: bundled(icu) = %{icu_version}
|
|||
Provides: bundled(uvwasi) = %{uvwasi_version}
|
||||
Provides: bundled(histogram) = %{histogram_version}
|
||||
|
||||
# Upstream has added a new URL parser that has no option to build as a shared
|
||||
# library (19.7.0+)
|
||||
Provides: bundled(ada) = ${ada_version}
|
||||
|
||||
|
||||
%description
|
||||
Node.js is a platform built on Chrome's JavaScript runtime \
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,7 +1,7 @@
|
|||
SHA512 (node-v19.6.1-stripped.tar.gz) = d766ec2b41cacedb8bfa03777f81ee1caafca56b523f6dac1a99020a54a635ffc957b1579d114103b1950bcad2e9efd7aa857f9c89cbcc998b7f7fec351b2ed5
|
||||
SHA512 (node-v19.7.0-stripped.tar.gz) = 44185c053a1dceec32e1b96e82d67bcdb392b38c31faac434d4b2d85af881691abb08035015aff7f392e580a0f410aa84b879d65c929ce9c9994f7ce2bb4ae05
|
||||
SHA512 (icu4c-72_1-data-bin-b.zip) = ed0ce3ebd02f81cca7b3808abc72dc99962eb36bd123ebdf45c578b307b674566491191b6f7d261c679b2b5662b7084c61452b98968b35df3f749d413d5d7663
|
||||
SHA512 (icu4c-72_1-data-bin-l.zip) = cc9a8cf2a89dacde4fab4a68ca7a7ba1fd106b71ebc23318fb9293ab96001be825bf89b1daf3da02958ba201ca4f714a67a26db3a51dc03653b9970ebdd5ff56
|
||||
SHA512 (cjs-module-lexer-1.2.2-stripped.tar.gz) = 6604250b609c8e6262f0601dbbd14745a6318bcb7d72ecc46a037c2239d69a0267d9fa6dfa26e676e117c36ed544ea302f18765defa8211cb02e9b3850ed1f58
|
||||
SHA512 (cjs-module-lexer-1.2.2-stripped.tar.gz) = e5dc3bad8f94cc307aa4ebc6ae125d04051245986c909d179321de4694c60c932ef49585eb62af35ce9497d30439e30b0549e767c1c654296d2c5c13827bfdd2
|
||||
SHA512 (wasi-sdk-11.0-linux.tar.gz) = e3ed4597f7f2290967eef6238e9046f60abbcb8633a4a2a51525d00e7393df8df637a98a5b668217d332dd44fcbf2442ec7efd5e65724e888d90611164451e20
|
||||
SHA512 (undici-5.19.1-stripped.tar.gz) = a6ea6ffcead6c6012707a87d0f3d4716ef493ee4c362f58c4e3d7007bba91a65d3e040b79528ea389ed2a087c5413487584c5b4356b3e679dd83e3f3142f5650
|
||||
SHA512 (undici-5.20.0-stripped.tar.gz) = d92d5895b641d2570030a35e0d88af9450541ff0557d9ed3fe16d60a51828e28e5cb00affe32036773487f97a287a30ca5f655a1679e113d64168a0d2b5bbf40
|
||||
SHA512 (wasi-sdk-14.0-linux.tar.gz) = 288a367e051f5b3f5853de97fabaedd3acf2255819d50c24f48f573897518500ea808342fd9aea832b2a5717089807bf1cbcf6d46b156b4eb60cc6b3c02ee997
|
||||
|
|
|
|||
Loading…
Reference in New Issue