summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch38
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch
new file mode 100644
index 0000000000..3a2719af34
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch
@@ -0,0 +1,38 @@
1From 048203c97009c907ff3891f6ffa8f375fcf1045c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 26 Oct 2021 08:34:39 -0700
4Subject: [PATCH] crypto: fix build without scrypt
5
6* add missing semicolon to fix:
7 In file included from ../src/node_crypto.h:47,
8 from ../src/node.cc:46:
9 ../src/crypto/crypto_scrypt.h:80:2:
10 error: expected ';' after struct definition
11 80 | }
12 | ^
13 | ;
14
15 and fix typo in the comment
16
17Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18Upstream-Status: Submitted [https://github.com/nodejs/node/pull/40613]
19
20---
21 src/crypto/crypto_scrypt.h | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/src/crypto/crypto_scrypt.h b/src/crypto/crypto_scrypt.h
25index 4ca888e31d..3d185637f4 100644
26--- a/src/crypto/crypto_scrypt.h
27+++ b/src/crypto/crypto_scrypt.h
28@@ -77,8 +77,8 @@ struct ScryptJob {
29 static void Initialize(
30 Environment* env,
31 v8::Local<v8::Object> target) {}
32-}
33-#endif // !OPENSSL_NO_SCRIPT
34+};
35+#endif // !OPENSSL_NO_SCRYPT
36
37 } // namespace crypto
38 } // namespace node
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb
index beed833c09..20e4c6614d 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb
@@ -24,6 +24,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
24 file://mips-less-memory.patch \ 24 file://mips-less-memory.patch \
25 file://system-c-ares.patch \ 25 file://system-c-ares.patch \
26 file://0001-liftoff-Correct-function-signatures.patch \ 26 file://0001-liftoff-Correct-function-signatures.patch \
27 file://0001-crypto-fix-build-without-scrypt.patch \
27 " 28 "
28SRC_URI:append:class-target = " \ 29SRC_URI:append:class-target = " \
29 file://0002-Using-native-binaries.patch \ 30 file://0002-Using-native-binaries.patch \