build nodejs with OpenSSL and ICU provided as proper dependencies

easybuild/easyconfigs/n/nodejs/nodejs-14.17.0-GCCcore-10.3.0.eb

@@ -14,33 +14,47 @@ toolchain = {'name': 'GCCcore', 'version': '10.3.0'}
 
 source_urls = ['http://%(name)s.org/dist/v%(version)s/']
 sources = ['node-v%(version)s.tar.gz']
-patches = ['%(name)s-%(version)s_fix-argument-list-too-long.patch']
+patches = [
+    '%(name)s-%(version)s_fix-argument-list-too-long.patch',
+    '%(name)s-%(version)s_use_new_icu69_calls.patch',
+]
 checksums = [
     '6114e82d3256136dc85a509d835442fbdf2f8430dcd8bfa7c304097344d06fb7',  # node-v14.17.0.tar.gz
     # nodejs-14.17.0_fix-argument-list-too-long.patch
     'b0eac4b478a9268c8902ec701f99e1445eeba2a70927bfacdeb5ba243e668550',
+    # nodejs-14.17.0_use_new_icu69_calls.patch
+    '24fbc749d225b395184aa9c4c3880665026ced898474d77259c597f6b790e290',
 ]
 
 builddependencies = [
     ('binutils', '2.36.1'),
     ('Python', '3.9.5'),
 ]
 
+dependencies = [
+    ('ICU', '69.1'),
+    ('OpenSSL', '1.1', '', SYSTEM),
+]
+
+# Use ICU and OpenSSL from EasyBuild
+local_common_configopts = "--with-intl=system-icu --shared-openssl "
+
 configopts = [
-    '--with-intl=none',           # Fully disable ICU to avoid issues with the embedded icu-small library
-    '--shared --with-intl=none',  # Build libnode.so in a second run
+    local_common_configopts,                  # Static build
+    '--shared %s' % local_common_configopts,  # Build libnode.so in a second run
 ]
 
 # Link libv8 libs to libnode
+local_extra_sonames = ['libnode', 'libv8', 'libv8_libbase', 'libv8_libplatform']
+local_extra_libs = ['%s.%s' % (x, SHLIB_EXT) for x in local_extra_sonames]
+local_libnode_real = "libnode.%s.%s" % (SHLIB_EXT, local_libversion)
+
 postinstallcmds = [
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libnode.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libbase.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libplatform.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
+    "cd %%(installdir)s/lib && ln -s %s %s" % (local_libnode_real, x) for x in local_extra_libs
 ]
 
 sanity_check_paths = {
-    'files': ['bin/node', 'bin/npm', 'lib/libnode.%s.%s' % (SHLIB_EXT, local_libversion)],
+    'files': ['bin/node', 'bin/npm'] + ['lib/%s' % x for x in [local_libnode_real] + local_extra_libs],
     'dirs': ['lib/node_modules', 'include/node']
 }
 

easybuild/easyconfigs/n/nodejs/nodejs-14.17.0_use_new_icu69_calls.patch

@@ -0,0 +1,92 @@
+From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001
+From: Frank Tang <[email protected]>
+Date: Thu, 15 Oct 2020 22:44:27 -0700
+Subject: [PATCH] [Intl] call new ListFormatter::createInstance
+
+The one we currently using is now marked as internal and to be removed
+for 68. Migrating to the style which already avaiable in ICU 67-1.
+
+Bug: v8:11031
+Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751
+Reviewed-by: Jakob Kummerow <[email protected]>
+Commit-Queue: Frank Tang <[email protected]>
+Cr-Commit-Position: refs/heads/master@{#70638}
+---
+
+diff --git a/deps/v8/src/objects/js-list-format.cc b/deps/v8/src/objects/js-list-format.cc
+index b17d38c..e48a387 100644
+--- a/deps/v8/src/objects/js-list-format.cc
++++ b/deps/v8/src/objects/js-list-format.cc
+@@ -29,46 +29,27 @@
+ namespace internal {
+
+ namespace {
+-const char* kStandard = "standard";
+-const char* kOr = "or";
+-const char* kUnit = "unit";
+-const char* kStandardShort = "standard-short";
+-const char* kOrShort = "or-short";
+-const char* kUnitShort = "unit-short";
+-const char* kStandardNarrow = "standard-narrow";
+-const char* kOrNarrow = "or-narrow";
+-const char* kUnitNarrow = "unit-narrow";
+
+-const char* GetIcuStyleString(JSListFormat::Style style,
+-                              JSListFormat::Type type) {
++UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
++  switch (style) {
++    case JSListFormat::Style::LONG:
++      return ULISTFMT_WIDTH_WIDE;
++    case JSListFormat::Style::SHORT:
++      return ULISTFMT_WIDTH_SHORT;
++    case JSListFormat::Style::NARROW:
++      return ULISTFMT_WIDTH_NARROW;
++  }
++  UNREACHABLE();
++}
++
++UListFormatterType GetIcuType(JSListFormat::Type type) {
+   switch (type) {
+     case JSListFormat::Type::CONJUNCTION:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kStandard;
+-        case JSListFormat::Style::SHORT:
+-          return kStandardShort;
+-        case JSListFormat::Style::NARROW:
+-          return kStandardNarrow;
+-      }
++      return ULISTFMT_TYPE_AND;
+     case JSListFormat::Type::DISJUNCTION:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kOr;
+-        case JSListFormat::Style::SHORT:
+-          return kOrShort;
+-        case JSListFormat::Style::NARROW:
+-          return kOrNarrow;
+-      }
++      return ULISTFMT_TYPE_OR;
+     case JSListFormat::Type::UNIT:
+-      switch (style) {
+-        case JSListFormat::Style::LONG:
+-          return kUnit;
+-        case JSListFormat::Style::SHORT:
+-          return kUnitShort;
+-        case JSListFormat::Style::NARROW:
+-          return kUnitNarrow;
+-      }
++      return ULISTFMT_TYPE_UNITS;
+   }
+   UNREACHABLE();
+ }
+@@ -143,7 +124,7 @@
+   icu::Locale icu_locale = r.icu_locale;
+   UErrorCode status = U_ZERO_ERROR;
+   icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
+-      icu_locale, GetIcuStyleString(style_enum, type_enum), status);
++      icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
+   if (U_FAILURE(status) || formatter == nullptr) {
+     delete formatter;
+     THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),

easybuild/easyconfigs/n/nodejs/nodejs-14.17.6-GCCcore-11.2.0.eb

@@ -21,21 +21,30 @@ builddependencies = [
     ('Python', '3.9.6', '-bare'),
 ]
 
+dependencies = [
+    ('ICU', '69.1'),
+    ('OpenSSL', '1.1', '', SYSTEM),
+]
+
+# Use ICU and OpenSSL from EasyBuild
+local_common_configopts = "--with-intl=system-icu --shared-openssl "
+
 configopts = [
-    '--with-intl=none',           # Fully disable ICU to avoid issues with the embedded icu-small library
-    '--shared --with-intl=none',  # Build libnode.so in a second run
+    local_common_configopts,                  # Static build
+    '--shared %s' % local_common_configopts,  # Build libnode.so in a second run
 ]
 
 # Link libv8 libs to libnode
+local_extra_sonames = ['libnode', 'libv8', 'libv8_libbase', 'libv8_libplatform']
+local_extra_libs = ['%s.%s' % (x, SHLIB_EXT) for x in local_extra_sonames]
+local_libnode_real = "libnode.%s.%s" % (SHLIB_EXT, local_libversion)
+
 postinstallcmds = [
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libnode.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libbase.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libplatform.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
+    "cd %%(installdir)s/lib && ln -s %s %s" % (local_libnode_real, x) for x in local_extra_libs
 ]
 
 sanity_check_paths = {
-    'files': ['bin/node', 'bin/npm', 'lib/libnode.%s.%s' % (SHLIB_EXT, local_libversion)],
+    'files': ['bin/node', 'bin/npm'] + ['lib/%s' % x for x in [local_libnode_real] + local_extra_libs],
     'dirs': ['lib/node_modules', 'include/node']
 }
 

easybuild/easyconfigs/n/nodejs/nodejs-16.15.1-GCCcore-11.3.0.eb

@@ -21,21 +21,30 @@ builddependencies = [
     ('Python', '3.10.4', '-bare'),
 ]
 
+dependencies = [
+    ('ICU', '71.1'),
+    ('OpenSSL', '1.1', '', SYSTEM),
+]
+
+# Use ICU and OpenSSL from EasyBuild
+local_common_configopts = "--with-intl=system-icu --shared-openssl "
+
 configopts = [
-    '--with-intl=none',           # Fully disable ICU to avoid issues with the embedded icu-small library
-    '--shared --with-intl=none',  # Build libnode.so in a second run
+    local_common_configopts,                  # Static build
+    '--shared %s' % local_common_configopts,  # Build libnode.so in a second run
 ]
 
 # Link libv8 libs to libnode
+local_extra_sonames = ['libnode', 'libv8', 'libv8_libbase', 'libv8_libplatform']
+local_extra_libs = ['%s.%s' % (x, SHLIB_EXT) for x in local_extra_sonames]
+local_libnode_real = "libnode.%s.%s" % (SHLIB_EXT, local_libversion)
+
 postinstallcmds = [
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libnode.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libbase.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
-    "cd %%(installdir)s/lib; ln -s libnode.%s.%s libv8_libplatform.%s" % (SHLIB_EXT, local_libversion, SHLIB_EXT),
+    "cd %%(installdir)s/lib && ln -s %s %s" % (local_libnode_real, x) for x in local_extra_libs
 ]
 
 sanity_check_paths = {
-    'files': ['bin/node', 'bin/npm', 'lib/libnode.%s.%s' % (SHLIB_EXT, local_libversion)],
+    'files': ['bin/node', 'bin/npm'] + ['lib/%s' % x for x in [local_libnode_real] + local_extra_libs],
     'dirs': ['lib/node_modules', 'include/node']
 }