Updated Makefile and dopatch to properly patch new version 8.11.2
and older one.
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
node/Makefile | 3 ++-
node/dopatch | 21 +++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/node/Makefile b/node/Makefile
index b80d9c9..09d3b0f 100644
--- a/node/Makefile
+++ b/node/Makefile
@@ -10,7 +10,8 @@ $(LIB_NODE):
# Support for OSv's combined kernel+module build system ('make modules=node'
# and 'make clean')
-VERSION=6.10.3
+VERSION=8.11.2
+#VERSION=6.10.3
module:
if test ! -d node-$(VERSION); then ./GET $(VERSION); $(MAKE)
NODE_VERSION=$(VERSION); fi
echo '/libnode.so: $${MODULE_DIR}/libnode-$(VERSION).so' > usr.manifest
diff --git a/node/dopatch b/node/dopatch
index bc82cc8..9a88226 100755
--- a/node/dopatch
+++ b/node/dopatch
@@ -15,12 +15,33 @@ cd "node-$1"
ed -s node.gyp << EOF
,s/\(['"]\)executable\1/\1shared_library\1/
g/'-Wl,--whole-archive/d
+g/'<(node_core_target_name)<(STATIC_LIB_SUFFIX)',/d
w
EOF
+if [ -f node.gypi ]
+then
+ed -s node.gypi << EOF
+,g/'-Wl,--whole-archive/d
+w
+EOF
+fi
+
ed -s common.gypi << EOF
,s/'cflags':.*'-pthread'/&, '-fPIC'/
w
EOF
+ed -s tools/gyp/pylib/gyp/generator/make.py << EOF
+,s/-Wl,--whole-archive//g
+w
+EOF
+
+TEXT_TO_DETECT_IF_GCC7_PATCH_NEEDED="class HashTable : public HashTableBase"
+TEXT_FOUND=`grep -o "$TEXT_TO_DETECT_IF_GCC7_PATCH_NEEDED"
deps/v8/src/objects.h`
+if [ "$TEXT_TO_DETECT_IF_GCC7_PATCH_NEEDED" == "$TEXT_FOUND" ]
+then
patch -p1 <../gcc7.patch
+else
+echo "Not necessary to patch for GCC 7"
+fi
--
2.7.4
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
