Browse Source

node: fix host build fail

modify patch.
 https://github.com/nodejs/node/pull/19196

made not to use libressl headers
 fix to include path not to use "host/include"

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
lilik-openwrt-22.03
Hirokazu MORIKAWA 7 years ago
committed by Yousong Zhou
parent
commit
818770d273
3 changed files with 26 additions and 15 deletions
  1. +1
    -2
      lang/node/Makefile
  2. +0
    -13
      lang/node/patches/004-node_crypto-remove-std.patch
  3. +25
    -0
      lang/node/patches/004-node_crypto_include_cmath.patch

+ 1
- 2
lang/node/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=node
PKG_VERSION:=v8.10.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
PKG_HASH:=b72d4e71618d6bcbd039b487b51fa7543631a4ac3331d7caf69bdf55b5b2901a
@ -128,7 +128,6 @@ HOST_CONFIGURE_VARS:=
HOST_CONFIGURE_ARGS:= \
--dest-os=linux \
--without-snapshot \
--shared-zlib \
--prefix=$(STAGING_DIR_HOSTPKG)
HOST_CONFIGURE_CMD:=python ./configure


+ 0
- 13
lang/node/patches/004-node_crypto-remove-std.patch View File

@ -1,13 +0,0 @@
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 972b1e4..7c0f65a 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5623,7 +5623,7 @@ void PBKDF2(const FunctionCallbackInfo<Value>& args) {
}
raw_keylen = args[3]->NumberValue();
- if (raw_keylen < 0.0 || std::isnan(raw_keylen) || std::isinf(raw_keylen) ||
+ if (raw_keylen < 0.0 || isnan(raw_keylen) || isinf(raw_keylen) ||
raw_keylen > INT_MAX) {
type_error = "Bad key length";
goto err;

+ 25
- 0
lang/node/patches/004-node_crypto_include_cmath.patch View File

@ -0,0 +1,25 @@
From 34825d50db18631a92902af3f51ddd27aa074c90 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer-gentoo@users.noreply.github.com>
Date: Fri, 13 Apr 2018 05:54:42 +0200
Subject: [PATCH 2/2] Include cmath ...
... instead of using the C implementations of isnan and isinf
---
src/node_crypto.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 7c0f65a5735..0aa4adbd467 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -44,9 +44,9 @@
#include "StartComAndWoSignData.inc"
#include <algorithm>
+#include <cmath>
#include <errno.h>
#include <limits.h> // INT_MAX
-#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <vector>

Loading…
Cancel
Save