Improve multiplatform support

lloeki · lloeki · commit e51a1dc122ab · 2020-11-05T17:19:24.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,8 +61,6 @@ jobs:
     runs-on: ubuntu-20.04
     container: ruby:2.2
     steps:
-        - name: Install system dependencies
-          run: apt-get update && apt-get install -y python3
         - name: Checkout
           uses: actions/checkout@v2
         - name: Bundle
diff --git a/build-libv8 b/build-libv8
@@ -5,14 +5,22 @@ set -u
 
 version="${1}"
 
-NJOBS="${NJOBS:-$(getconf _NPROCESSORS_ONLN 2>/dev/null || true)}"
+NJOBS="${NJOBS:-$(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || true)}"
 NJOBS="${NJOBS:-1}"
 
 echo "parallel job count: ${NJOBS}"
 
 cd "src/node-${version}"
 
-python2 configure --openssl-no-asm --without-npm --shared --with-intl=small-icu
+patch -p1 < ../../py2-icutrim.patch
+
+if which python3 >/dev/null 2>&1; then
+    PYTHON="${PYTHON:-python3}"
+else
+    PYTHON="${PYTHON:-python2}"
+fi
+
+"${PYTHON}" configure --openssl-no-asm --without-npm --shared --with-intl=small-icu
 make -j"${NJOBS}"
 
 # taken from
diff --git a/download-node b/download-node
@@ -5,6 +5,17 @@ set -u
 
 version="${1}"
 
+platform=$(uname)
+
+case "${platform}" in
+    SunOS)
+        CURLOPTS="${CURLOPTS:--k}"
+        ;;
+    *)
+        CURLOPTS="${CURLOPTS:-}"
+        ;;
+esac
+
 mkdir -p src
 
-curl -L -o "src/node-${version}.tar.gz" "https://github.com/nodejs/node/archive/v${version}.tar.gz"
+curl ${CURLOPTS} -L -o "src/node-${version}.tar.gz" "https://github.com/nodejs/node/archive/v${version}.tar.gz"
diff --git a/extract-node b/extract-node
@@ -5,4 +5,15 @@ set -u
 
 version="${1}"
 
-tar -C src -xz -f "src/node-${version}.tar.gz"
+platform=$(uname)
+
+case "${platform}" in
+    SunOS)
+        TAR="${TAR:-gtar}"
+        ;;
+    *)
+        TAR="${TAR:-tar}"
+        ;;
+esac
+
+"${TAR}" -C src -xz -f "src/node-${version}.tar.gz"
diff --git a/py2-icutrim.patch b/py2-icutrim.patch
@@ -0,0 +1,14 @@
+--- a/tools/icu/icutrim.py	2020-11-03 16:54:23.000000000 +0100
++++ b/tools/icu/icutrim.py	2020-11-03 16:54:27.000000000 +0100
+@@ -316,7 +316,10 @@
+             erritems = fi.readlines()
+             fi.close()
+             #Item zone/zh_Hant_TW.res depends on missing item zone/zh_Hant.res
+-            pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8'))
++            if str == bytes:
++              pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*"))
++            else:
++              pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8'))
+             for i in range(len(erritems)):
+                 line = erritems[i].strip()
+                 m = pat.match(line)
