1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build,test: add proper support for IBM i

Browse Source 
Python 3.9 on IBM i now properly returns "os400" for sys.platform
instead of claiming to be AIX as it did previously. While the IBM i PASE
environment is compatible with AIX, it is a subset and has numerous
differences which makes it beneficial to distinguish, however this means
that it now needs explicit support here.

PR-URL: https://github.com/nodejs/node/pull/46739
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
This commit is contained in:
Xu Meng 2023-02-22 12:18:56 +08:00 committed by GitHub
parent 655b070d31
commit a3211e18b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -368,6 +368,9 @@ DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.mjs doc/api/addons.md
ifeq ($(OSTYPE),aix) ifeq ($(OSTYPE),aix)
DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
endif endif
ifeq ($(OSTYPE),os400)
DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
endif
node_use_openssl = $(call available-node,"-p" \ node_use_openssl = $(call available-node,"-p" \
"process.versions.openssl != undefined") "process.versions.openssl != undefined")

12
common.gypi
View File

@ -137,7 +137,7 @@
'defines': [ 'DEBUG', '_DEBUG', 'V8_ENABLE_CHECKS' ], 'defines': [ 'DEBUG', '_DEBUG', 'V8_ENABLE_CHECKS' ],
'cflags': [ '-g', '-O0' ], 'cflags': [ '-g', '-O0' ],
'conditions': [ 'conditions': [
['OS=="aix"', { ['OS in "aix os400"', {
'cflags': [ '-gxcoff' ], 'cflags': [ '-gxcoff' ],
'ldflags': [ '-Wl,-bbigtoc' ], 'ldflags': [ '-Wl,-bbigtoc' ],
}], }],
@ -393,11 +393,11 @@
'BUILDING_UV_SHARED=1', 'BUILDING_UV_SHARED=1',
], ],
}], }],
[ 'OS in "linux freebsd openbsd solaris aix"', { [ 'OS in "linux freebsd openbsd solaris aix os400"', {
'cflags': [ '-pthread' ], 'cflags': [ '-pthread' ],
'ldflags': [ '-pthread' ], 'ldflags': [ '-pthread' ],
}], }],
[ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { [ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ], 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ],
'defines': [ '__STDC_FORMAT_MACROS' ], 'defines': [ '__STDC_FORMAT_MACROS' ],
@ -421,11 +421,11 @@
'cflags': [ '-m64' ], 'cflags': [ '-m64' ],
'ldflags': [ '-m64' ], 'ldflags': [ '-m64' ],
}], }],
[ 'target_arch=="ppc" and OS!="aix"', { [ 'target_arch=="ppc" and OS not in "aix os400"', {
'cflags': [ '-m32' ], 'cflags': [ '-m32' ],
'ldflags': [ '-m32' ], 'ldflags': [ '-m32' ],
}], }],
[ 'target_arch=="ppc64" and OS!="aix"', { [ 'target_arch=="ppc64" and OS not in "aix os400"', {
'cflags': [ '-m64', '-mminimal-toc' ], 'cflags': [ '-m64', '-mminimal-toc' ],
'ldflags': [ '-m64' ], 'ldflags': [ '-m64' ],
}], }],
@ -444,7 +444,7 @@
}], }],
], ],
}], }],
[ 'OS=="aix"', { [ 'OS in "aix os400"', {
'variables': { 'variables': {
# Used to differentiate `AIX` and `OS400`(IBM i). # Used to differentiate `AIX` and `OS400`(IBM i).
'aix_variant_name': '<!(uname -s)', 'aix_variant_name': '<!(uname -s)',

9
configure.py
View File

@ -45,7 +45,7 @@ from utils import SearchFiles
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
'android', 'aix', 'cloudabi', 'ios') 'android', 'aix', 'cloudabi', 'os400', 'ios')
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
'ppc64', 'x64', 'x86', 'x86_64', 's390x', 'riscv64', 'loong64') 'ppc64', 'x64', 'x86', 'x86_64', 's390x', 'riscv64', 'loong64')
valid_arm_float_abi = ('soft', 'softfp', 'hard') valid_arm_float_abi = ('soft', 'softfp', 'hard')
@ -1302,7 +1302,7 @@ def configure_node(o):
elif sys.platform == 'zos': elif sys.platform == 'zos':
configure_zos(o) configure_zos(o)
if flavor == 'aix': if flavor in ('aix', 'os400'):
o['variables']['node_target_type'] = 'static_library' o['variables']['node_target_type'] = 'static_library'
if target_arch in ('x86', 'x64', 'ia32', 'x32'): if target_arch in ('x86', 'x64', 'ia32', 'x32'):
@ -1403,6 +1403,8 @@ def configure_node(o):
shlib_suffix = '%s.dylib' shlib_suffix = '%s.dylib'
elif sys.platform.startswith('aix'): elif sys.platform.startswith('aix'):
shlib_suffix = '%s.a' shlib_suffix = '%s.a'
elif sys.platform == 'os400':
shlib_suffix = '%s.a'
elif sys.platform.startswith('zos'): elif sys.platform.startswith('zos'):
shlib_suffix = '%s.x' shlib_suffix = '%s.x'
else: else:
@ -1916,6 +1918,9 @@ def configure_intl(o):
elif flavor == 'mac': elif flavor == 'mac':
icu_config['variables']['icu_asm_ext'] = 'S' icu_config['variables']['icu_asm_ext'] = 'S'
icu_config['variables']['icu_asm_opts'] = [ '-a', 'gcc-darwin' ] icu_config['variables']['icu_asm_opts'] = [ '-a', 'gcc-darwin' ]
elif sys.platform == 'os400':
icu_config['variables']['icu_asm_ext'] = 'S'
icu_config['variables']['icu_asm_opts'] = [ '-a', 'xlc' ]
elif sys.platform.startswith('aix'): elif sys.platform.startswith('aix'):
icu_config['variables']['icu_asm_ext'] = 'S' icu_config['variables']['icu_asm_ext'] = 'S'
icu_config['variables']['icu_asm_opts'] = [ '-a', 'xlc' ] icu_config['variables']['icu_asm_opts'] = [ '-a', 'xlc' ]

2
deps/cares/cares.gyp vendored
View File

@ -9,7 +9,7 @@
'_GNU_SOURCE' '_GNU_SOURCE'
] ]
}], }],
[ 'OS=="aix"', { [ 'OS in "aix os400"', {
'include_dirs': [ 'config/aix' ], 'include_dirs': [ 'config/aix' ],
'sources': [ 'config/aix/ares_config.h' ], 'sources': [ 'config/aix/ares_config.h' ],
'defines': [ 'defines': [

2
deps/uv/common.gypi vendored
View File

@ -135,7 +135,7 @@
}] }]
] ]
}], }],
['OS in "freebsd dragonflybsd linux openbsd solaris android aix"', { ['OS in "freebsd dragonflybsd linux openbsd solaris android aix os400"', {
'cflags': [ '-Wall' ], 'cflags': [ '-Wall' ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ], 'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
'target_conditions': [ 'target_conditions': [

15
deps/uv/uv.gyp vendored
View File

@ -326,6 +326,21 @@
}], }],
] ]
}], }],
[ 'OS=="os400"', {
'sources': [
'src/unix/aix-common.c',
'src/unix/ibmi.c',
'src/unix/posix-poll.c',
'src/unix/no-fsevents.c',
'src/unix/no-proctitle.c',
],
'defines': [
'_ALL_SOURCE',
'_XOPEN_SOURCE=500',
'_LINUX_SOURCE_COMPAT',
'_THREAD_SAFE',
],
}],
[ 'OS=="freebsd" or OS=="dragonflybsd"', { [ 'OS=="freebsd" or OS=="dragonflybsd"', {
'sources': [ 'src/unix/freebsd.c' ], 'sources': [ 'src/unix/freebsd.c' ],
}], }],

12
node.gyp
View File

@ -61,7 +61,7 @@
[ 'node_shared=="true"', { [ 'node_shared=="true"', {
'node_target_type%': 'shared_library', 'node_target_type%': 'shared_library',
'conditions': [ 'conditions': [
['OS=="aix"', { ['OS in "aix os400"', {
# For AIX, always generate static library first, # For AIX, always generate static library first,
# It needs an extra step to generate exp and # It needs an extra step to generate exp and
# then use both static lib and exp to create # then use both static lib and exp to create
@ -110,7 +110,7 @@
}, },
'conditions': [ 'conditions': [
['OS=="aix"', { ['OS in "aix os400"', {
'ldflags': [ 'ldflags': [
'-Wl,-bnoerrmsg', '-Wl,-bnoerrmsg',
], ],
@ -192,7 +192,7 @@
}, },
}], }],
[ 'node_intermediate_lib_type=="static_library" and ' [ 'node_intermediate_lib_type=="static_library" and '
'node_shared=="true" and OS=="aix"', { 'node_shared=="true" and OS in "aix os400"', {
# For AIX, shared lib is linked by static lib and .exp. In the # For AIX, shared lib is linked by static lib and .exp. In the
# case here, the executable needs to link to shared lib. # case here, the executable needs to link to shared lib.
# Therefore, use 'node_aix_shared' target to generate the # Therefore, use 'node_aix_shared' target to generate the
@ -227,7 +227,7 @@
}, },
}, },
'conditions': [ 'conditions': [
['OS != "aix" and OS != "mac" and OS != "ios"', { ['OS != "aix" and OS != "os400" and OS != "mac" and OS != "ios"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive', '-Wl,--whole-archive',
'<(obj_dir)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)', '<(obj_dir)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
@ -741,7 +741,7 @@
'NODE_USE_NODE_CODE_CACHE=1', 'NODE_USE_NODE_CODE_CACHE=1',
], ],
}], }],
['node_shared=="true" and OS=="aix"', { ['node_shared=="true" and OS in "aix os400"', {
'product_name': 'node_base', 'product_name': 'node_base',
}], }],
[ 'v8_enable_inspector==1', { [ 'v8_enable_inspector==1', {
@ -1170,7 +1170,7 @@
], # end targets ], # end targets
'conditions': [ 'conditions': [
['OS=="aix" and node_shared=="true"', { ['OS in "aix os400" and node_shared=="true"', {
'targets': [ 'targets': [
{ {
'target_name': 'node_aix_shared', 'target_name': 'node_aix_shared',

6
node.gypi
View File

@ -156,7 +156,7 @@
}, },
}, },
'conditions': [ 'conditions': [
['OS!="aix" and OS!="ios" and node_shared=="false"', { ['OS!="aix" and OS!="os400" and OS!="ios" and node_shared=="false"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive', '-Wl,--whole-archive',
'<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', '<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)',
@ -195,7 +195,7 @@
}, },
}, },
'conditions': [ 'conditions': [
['OS!="aix" and OS!="ios" and node_shared=="false"', { ['OS!="aix" and OS!="os400" and OS!="ios" and node_shared=="false"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive', '-Wl,--whole-archive',
'<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)', '<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)',
@ -233,7 +233,7 @@
'-lkvm', '-lkvm',
], ],
}], }],
[ 'OS=="aix"', { [ 'OS in "aix os400"', {
'defines': [ 'defines': [
'_LINUX_SOURCE_COMPAT', '_LINUX_SOURCE_COMPAT',
'__STDC_FORMAT_MACROS', '__STDC_FORMAT_MACROS',

2
test/addons/common.gypi
View File

@ -1,7 +1,7 @@
{ {
'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
'conditions': [ 'conditions': [
[ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { [ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
'cflags': ['-Wno-cast-function-type'], 'cflags': ['-Wno-cast-function-type'],
}], }],
], ],

2
test/addons/dlopen-ping-pong/binding.gyp
View File

@ -11,7 +11,7 @@
'OTHER_LDFLAGS': [ '-Wl,-undefined', '-Wl,dynamic_lookup' ] 'OTHER_LDFLAGS': [ '-Wl,-undefined', '-Wl,dynamic_lookup' ]
}}], }}],
# Enable the shared object to be linked by runtime linker # Enable the shared object to be linked by runtime linker
['OS=="aix"', { ['OS in "aix os400"', {
'ldflags': [ '-Wl,-G' ] 'ldflags': [ '-Wl,-G' ]
}]], }]],
}, },

2
test/addons/openssl-binding/binding.gyp
View File

@ -6,7 +6,7 @@
'conditions': [ 'conditions': [
['node_use_openssl=="true"', { ['node_use_openssl=="true"', {
'conditions': [ 'conditions': [
['OS=="aix"', { ['OS in "aix os400"', {
'variables': { 'variables': {
# Used to differentiate `AIX` and `OS400`(IBM i). # Used to differentiate `AIX` and `OS400`(IBM i).
'aix_variant_name': '<!(uname -s)', 'aix_variant_name': '<!(uname -s)',

2
test/addons/openssl-providers/binding.gyp
View File

@ -6,7 +6,7 @@
'conditions': [ 'conditions': [
['node_use_openssl=="true"', { ['node_use_openssl=="true"', {
'conditions': [ 'conditions': [
['OS=="aix"', { ['OS in "aix os400"', {
'variables': { 'variables': {
# Used to differentiate `AIX` and `OS400`(IBM i). # Used to differentiate `AIX` and `OS400`(IBM i).
'aix_variant_name': '<!(uname -s)', 'aix_variant_name': '<!(uname -s)',

2
test/addons/zlib-binding/binding.gyp
View File

@ -3,7 +3,7 @@
{ {
'target_name': 'binding', 'target_name': 'binding',
'conditions': [ 'conditions': [
['OS=="aix"', { ['OS in "aix os400"', {
'variables': { 'variables': {
# Used to differentiate `AIX` and `OS400`(IBM i). # Used to differentiate `AIX` and `OS400`(IBM i).
'aix_variant_name': '<!(uname -s)', 'aix_variant_name': '<!(uname -s)',

2
tools/install.py
View File

@ -274,7 +274,7 @@ def headers(action):
], 'include/node/') ], 'include/node/')
# Add the expfile that is created on AIX # Add the expfile that is created on AIX
if sys.platform.startswith('aix'): if sys.platform.startswith('aix') or sys.platform == "os400":
action(['out/Release/node.exp'], 'include/node/') action(['out/Release/node.exp'], 'include/node/')
subdir_files('deps/v8/include', 'include/node/', wanted_v8_headers) subdir_files('deps/v8/include', 'include/node/', wanted_v8_headers)

2
tools/v8_gypfiles/d8.gyp
View File

@ -47,7 +47,7 @@
}], }],
['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \ ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
or OS=="openbsd" or OS=="solaris" or OS=="android" \ or OS=="openbsd" or OS=="solaris" or OS=="android" \
or OS=="qnx" or OS=="aix")', { or OS=="qnx" or OS=="aix" or OS=="os400")', {
'sources': [ '<(V8_ROOT)/src/d8/d8-posix.cc', ] 'sources': [ '<(V8_ROOT)/src/d8/d8-posix.cc', ]
}], }],
[ 'OS=="win"', { [ 'OS=="win"', {

16
tools/v8_gypfiles/toolchain.gypi
View File

@ -330,11 +330,11 @@
'V8_TARGET_ARCH_PPC_BE', 'V8_TARGET_ARCH_PPC_BE',
], ],
'conditions': [ 'conditions': [
['OS=="aix"', { ['OS=="aix" or OS=="os400"', {
# Work around AIX ceil, trunc and round oddities. # Work around AIX ceil, trunc and round oddities.
'cflags': [ '-mcpu=power5+ -mfprnd' ], 'cflags': [ '-mcpu=power5+ -mfprnd' ],
}], }],
['OS=="aix"', { ['OS=="aix" or OS=="os400"', {
# Work around AIX assembler popcntb bug. # Work around AIX assembler popcntb bug.
'cflags': [ '-mno-popcntb' ], 'cflags': [ '-mno-popcntb' ],
}], }],
@ -651,7 +651,7 @@
], ],
}], }],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
or OS=="netbsd" or OS=="qnx" or OS=="aix"', { or OS=="netbsd" or OS=="qnx" or OS=="aix" or OS=="os400"', {
'conditions': [ 'conditions': [
[ 'v8_no_strict_aliasing==1', { [ 'v8_no_strict_aliasing==1', {
'cflags': [ '-fno-strict-aliasing' ], 'cflags': [ '-fno-strict-aliasing' ],
@ -667,7 +667,7 @@
['OS=="netbsd"', { ['OS=="netbsd"', {
'cflags': [ '-I/usr/pkg/include' ], 'cflags': [ '-I/usr/pkg/include' ],
}], }],
['OS=="aix"', { ['OS=="aix" or OS=="os400"', {
'defines': [ 'defines': [
# Support for malloc(0) # Support for malloc(0)
'_LINUX_SOURCE_COMPAT=1', '_LINUX_SOURCE_COMPAT=1',
@ -700,7 +700,7 @@
# Support for backtrace_symbols. # Support for backtrace_symbols.
'ldflags': [ '-rdynamic' ], 'ldflags': [ '-rdynamic' ],
}], }],
['OS=="aix"', { ['OS=="aix" or OS=="os400"', {
'ldflags': [ '-Wl,-bbigtoc' ], 'ldflags': [ '-Wl,-bbigtoc' ],
'conditions': [ 'conditions': [
['v8_target_arch=="ppc64"', { ['v8_target_arch=="ppc64"', {
@ -744,7 +744,7 @@
}, },
'conditions': [ 'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
OS=="qnx" or OS=="aix"', { OS=="qnx" or OS=="aix" or OS=="os400"', {
'cflags!': [ 'cflags!': [
'-O3', '-O3',
'-O2', '-O2',
@ -795,7 +795,7 @@
}, },
'conditions': [ 'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
OS=="qnx" or OS=="aix"', { OS=="qnx" or OS=="aix" or OS=="os400"', {
'cflags!': [ 'cflags!': [
'-O0', '-O0',
'-O1', '-O1',
@ -845,7 +845,7 @@
'defines!': ['ENABLE_HANDLE_ZAPPING',], 'defines!': ['ENABLE_HANDLE_ZAPPING',],
'conditions': [ 'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
or OS=="aix"', { or OS=="aix" or OS=="os400"', {
'cflags!': [ 'cflags!': [
'-Os', '-Os',
], ],

4
tools/v8_gypfiles/v8.gyp
View File

@ -1064,7 +1064,7 @@
'<(V8_ROOT)/src/base/platform/platform-posix.h', '<(V8_ROOT)/src/base/platform/platform-posix.h',
], ],
'conditions': [ 'conditions': [
['OS != "aix" and OS != "solaris"', { ['OS != "aix" and OS != "os400" and OS != "solaris"', {
'sources': [ 'sources': [
'<(V8_ROOT)/src/base/platform/platform-posix-time.cc', '<(V8_ROOT)/src/base/platform/platform-posix-time.cc',
'<(V8_ROOT)/src/base/platform/platform-posix-time.h', '<(V8_ROOT)/src/base/platform/platform-posix-time.h',
@ -1084,7 +1084,7 @@
], ],
}, },
}], }],
['OS=="aix"', { ['OS in "aix os400"', {
'variables': { 'variables': {
# Used to differentiate `AIX` and `OS400`(IBM i). # Used to differentiate `AIX` and `OS400`(IBM i).
'aix_variant_name': '<!(uname -s)', 'aix_variant_name': '<!(uname -s)',