Fix Solaris build

lloeki · lloeki · commit ef6fad2f475d · 2020-11-05T17:19:24.000+01:00
diff --git a/build-libv8 b/build-libv8
@@ -5,33 +5,36 @@ set -u
 
 version="${1}"
 
+platform=$(uname)
+
 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}"
 
-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
-# ./configure
-# make
-#   make -C out BUILDTYPE=Release V=1
-
-#python configure.py --openssl-no-asm --without-npm
-#make BUILDTYPE=Release out/Makefile
-#make -C out BUILDTYPE=Release V=1 v8
-#make -C out BUILDTYPE=Release V=1 v8_libbase
-#make -C out BUILDTYPE=Release V=1 v8_libplatform
-#make -C out BUILDTYPE=Release V=1 v8_libsampler
+case "${platform}" in
+    SunOS)
+        export CC="${CC:-/opt/local/gcc7/bin/gcc}"
+        export CXX="${CXX:-/opt/local/gcc7/bin/g++}"
+        ;;
+    *)
+        if cc --version | grep 4.9 >/dev/null; then
+            export CC="${CC:-clang}"
+            export CXX="${CXX:-clang++}"
+        fi
+        ;;
+esac
 
+"${PYTHON}" configure --openssl-no-asm --without-npm --shared --with-intl=small-icu
+make BUILDTYPE=Release config.gypi
+make BUILDTYPE=Release out/Makefile
+export PATH="${PWD}/out/tools/bin:${PATH}"
+make -j"${NJOBS}" -C out BUILDTYPE=Release V=0 v8 v8_libbase v8_libplatform v8_libsampler
diff --git a/extract-node b/extract-node
@@ -17,3 +17,19 @@ case "${platform}" in
 esac
 
 "${TAR}" -C src -xz -f "src/node-${version}.tar.gz"
+
+cd "src/node-${version}"
+
+patch -p1 < ../../py2-icutrim.patch
+patch -p1 < ../../py2-genv8constants.patch
+
+# TODO: the following still fails on py3 so the above one forcing py2 is needed
+# patch -p1 < ../../py3-genv8constants.patch
+#
+# This is the error:
+#
+#     Traceback (most recent call last):
+#       File "tools/genv8constants.py", line 99, in <module>
+#         curr_val += int('0x%s' % octetstr, 16) << (curr_octet * 8)
+#     ValueError: invalid literal for int() with base 16: "0xb'04 '"
+#     node_dtrace_ustack.target.mk:13: recipe for target '/usbkey/user_home/vagrant/ruby-libv8-node/src/node-14.14.0/out/Release/obj/gen/v8constants.h' failed
diff --git a/py2-genv8constants.patch b/py2-genv8constants.patch
@@ -0,0 +1,10 @@
+--- a/tools/genv8constants.py	2020-11-04 09:49:14.000000000 +0100
++++ b/tools/genv8constants.py	2020-11-04 12:40:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ #
+ # genv8constants.py output_file libv8_base.a
+
+
diff --git a/py3-genv8constants.patch b/py3-genv8constants.patch
@@ -0,0 +1,20 @@
+--- a/tools/genv8constants.py	2020-11-04 09:49:14.000000000 +0100
++++ b/tools/genv8constants.py	2020-11-04 09:49:25.000000000 +0100
+@@ -33,9 +33,14 @@
+ 
+   sys.exit()
+ 
+-pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:'))
+-v8dbg = re.compile(bytes('^v8dbg.*$'))
+-numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $'))
++if str == bytes:
++  pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:'))
++  v8dbg = re.compile(bytes('^v8dbg.*$'))
++  numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $'))
++else:
++  pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:', 'utf-8'))
++  v8dbg = re.compile(bytes('^v8dbg.*$', 'utf-8'))
++  numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $', 'utf-8'))
+ octets = 4
+ 
+ outfile.write("""
