155 lines
5.3 KiB
Diff
155 lines
5.3 KiB
Diff
--- node-v18.12.1-orig/node.gyp 2022-11-05 00:13:14.000000000 +0800
|
|
+++ node-v18.12.1/node.gyp 2022-11-16 19:04:55.779964100 +0800
|
|
@@ -90,7 +90,7 @@
|
|
# Putting these explicitly here so not to depend on `common.gypi`.
|
|
# `common.gypi` need to be more general because it is used to build userland native addons.
|
|
# Refs: https://github.com/nodejs/node-gyp/issues/1118
|
|
- 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
|
|
+ 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-unused-function', '-Wno-unused-variable', ],
|
|
'xcode_settings': {
|
|
'WARNING_CFLAGS': [
|
|
'-Wall',
|
|
@@ -158,6 +158,7 @@
|
|
],
|
|
|
|
'sources': [
|
|
+ 'src/res/node.rc',
|
|
'src/node_main.cc'
|
|
],
|
|
|
|
@@ -203,7 +207,7 @@
|
|
}, {
|
|
'dependencies': [ '<(node_lib_target_name)' ],
|
|
'conditions': [
|
|
- ['OS=="win" and node_shared=="true"', {
|
|
+ ['OS=="winmsvs" and node_shared=="true"', {
|
|
'dependencies': ['generate_node_def'],
|
|
'msvs_settings': {
|
|
'VCLinkerTool': {
|
|
@@ -237,7 +241,7 @@
|
|
'-Wl,--no-whole-archive',
|
|
],
|
|
}],
|
|
- [ 'OS=="win"', {
|
|
+ [ 'OS=="winmsvs"', {
|
|
'sources': [ 'src/res/node.rc' ],
|
|
'conditions': [
|
|
[ 'node_use_etw=="true"', {
|
|
@@ -755,7 +759,7 @@
|
|
}, {
|
|
'defines': [ 'HAVE_INSPECTOR=0' ]
|
|
}],
|
|
- [ 'OS=="win"', {
|
|
+ [ 'OS=="winmsvs"', {
|
|
'conditions': [
|
|
[ 'node_intermediate_lib_type!="static_library"', {
|
|
'sources': [
|
|
@@ -1466,7 +1476,7 @@
|
|
},
|
|
]
|
|
}], # end aix section
|
|
- ['OS=="win" and node_shared=="true"', {
|
|
+ ['OS=="winmsvs" and node_shared=="true"', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'gen_node_def',
|
|
--- node-v18.12.1-orig/deps/base64/base64.gyp 2022-11-05 00:13:11.000000000 +0800
|
|
+++ node-v18.12.1/deps/base64/base64.gyp 2022-11-20 18:01:02.107916300 +0800
|
|
@@ -73,7 +73,7 @@
|
|
'sources': [ 'base64/lib/arch/ssse3/codec.c' ],
|
|
'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSSE3=1' ],
|
|
'conditions': [
|
|
- [ 'OS!="win"', {
|
|
+ [ 'OS!="winmsvs"', {
|
|
'cflags': [ '-mssse3' ],
|
|
'xcode_settings': {
|
|
'OTHER_CFLAGS': [ '-mssse3' ]
|
|
@@ -89,7 +89,7 @@
|
|
'sources': [ 'base64/lib/arch/sse41/codec.c' ],
|
|
'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSE41=1' ],
|
|
'conditions': [
|
|
- [ 'OS!="win"', {
|
|
+ [ 'OS!="winmsvs"', {
|
|
'cflags': [ '-msse4.1' ],
|
|
'xcode_settings': {
|
|
'OTHER_CFLAGS': [ '-msse4.1' ]
|
|
@@ -105,7 +105,7 @@
|
|
'sources': [ 'base64/lib/arch/sse42/codec.c' ],
|
|
'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSE42=1' ],
|
|
'conditions': [
|
|
- [ 'OS!="win"', {
|
|
+ [ 'OS!="winmsvs"', {
|
|
'cflags': [ '-msse4.2' ],
|
|
'xcode_settings': {
|
|
'OTHER_CFLAGS': [ '-msse4.2' ]
|
|
@@ -121,7 +121,7 @@
|
|
'sources': [ 'base64/lib/arch/avx/codec.c' ],
|
|
'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_AVX=1' ],
|
|
'conditions': [
|
|
- [ 'OS!="win"', {
|
|
+ [ 'OS!="winmsvs"', {
|
|
'cflags': [ '-mavx' ],
|
|
'xcode_settings': {
|
|
'OTHER_CFLAGS': [ '-mavx' ]
|
|
@@ -145,7 +145,7 @@
|
|
'sources': [ 'base64/lib/arch/avx2/codec.c' ],
|
|
'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_AVX2=1' ],
|
|
'conditions': [
|
|
- [ 'OS!="win"', {
|
|
+ [ 'OS!="winmsvs"', {
|
|
'cflags': [ '-mavx2' ],
|
|
'xcode_settings': {
|
|
'OTHER_CFLAGS': [ '-mavx2' ]
|
|
@@ -169,7 +169,7 @@
|
|
'sources': [ 'base64/lib/arch/neon32/codec.c' ],
|
|
'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_NEON32=1' ],
|
|
'conditions': [
|
|
- [ 'OS!="win"', {
|
|
+ [ 'OS!="winmsvs"', {
|
|
'cflags': [ '-mfpu=neon' ],
|
|
'xcode_settings': {
|
|
'OTHER_CFLAGS': [ '-mfpu=neon' ]
|
|
--- node-v18.12.1-orig/deps/llhttp/llhttp.gyp 2022-11-05 00:13:12.000000000 +0800
|
|
+++ node-v18.12.1/deps/llhttp/llhttp.gyp 2022-11-20 17:44:03.868239800 +0800
|
|
@@ -3,6 +3,7 @@
|
|
{
|
|
'target_name': 'llhttp',
|
|
'type': 'static_library',
|
|
+ 'cflags': [ '-mssse3' ],
|
|
'include_dirs': [ '.', 'include' ],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [ 'include' ],
|
|
--- node-v18.12.1-orig/deps/ngtcp2/ngtcp2.gyp 2022-11-05 00:13:12.000000000 +0800
|
|
+++ node-v18.12.1/deps/ngtcp2/ngtcp2.gyp 2022-11-20 17:16:12.615723100 +0800
|
|
@@ -101,6 +101,7 @@
|
|
]
|
|
}],
|
|
['OS=="win"', {
|
|
+ 'cflags': [ '-mssse3' ],
|
|
'defines': [
|
|
'WIN32',
|
|
'_WINDOWS',
|
|
--- node-v18.12.1-orig/tools/v8_gypfiles/features.gypi 2022-11-05 00:13:15.000000000 +0800
|
|
+++ node-v18.12.1/tools/v8_gypfiles/features.gypi 2022-11-19 13:55:40.561854400 +0800
|
|
@@ -41,6 +41,11 @@
|
|
}, {
|
|
'is_win': 0,
|
|
}],
|
|
+ ['OS == "winmsvs"', {
|
|
+ 'is_msvs': 1,
|
|
+ }, {
|
|
+ 'is_msvs': 0,
|
|
+ }],
|
|
['OS == "fuchsia"', {
|
|
'is_fuchsia': 1,
|
|
}, {
|
|
@@ -62,7 +67,7 @@
|
|
}, {
|
|
'is_component_build': 0,
|
|
}],
|
|
- ['OS == "win" or OS == "mac"', {
|
|
+ ['OS == "winmsvs" or OS == "mac"', {
|
|
# Sets -DSYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing
|
|
'v8_enable_system_instrumentation': 1,
|
|
}, {
|