Merge pull request #348 from braydonf/node-v4

Added compilation support for Node.js v4
bitpay · Oct 29, 2015 · 275a0b5 · 275a0b5
2 parents 0c3ea83 + 3744100
commit 275a0b5
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 103 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,17 @@
 sudo: false
 language: node_js
 env:
-- BITCORENODE_ENV=test BITCORENODE_ASSUME_YES=true
+  - BITCORENODE_ENV=test BITCORENODE_ASSUME_YES=true CXX=g++-4.8 CC=gcc-4.8
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+      - gcc-4.8
 node_js:
   - "v0.12.7"
+  - "v4"
 before_install:
   - git config --global user.email "[email protected]"
   - git config --global user.name "BitPay, Inc."

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Note: For your convenience, we distribute binaries for x86_64 Linux and x86_64 M
 
 ## Prerequisites
 
-- Node.js v0.12
+- Node.js v0.12 or v4.2
 - ~100GB of disk storage
 - ~4GB of RAM
 - Mac OS X >= 10.9, Ubuntu >= 12.04 (libc >= 2.15 and libstdc++ >= 6.0.16)

diff --git a/bin/get-tarball-name.js b/bin/get-tarball-name.js
@@ -5,7 +5,8 @@ function getTarballName() {
   var version = require(packageRoot + '/package.json').version;
   var platform = process.platform;
   var arch = process.arch;
-  var tarballName = 'libbitcoind-' + version + '-' + platform + '-' + arch + '.tgz';
+  var abi = process.versions.modules;
+  var tarballName = 'libbitcoind-' + version + '-node' + abi + '-' + platform + '-' + arch + '.tgz';
   return tarballName;
 }
 

diff --git a/binding.gyp b/binding.gyp
@@ -48,8 +48,7 @@
           "<!(./bin/variables.sh memenv)",
           "<!(./bin/variables.sh bdb)",
           "<!(./bin/variables.sh anl)",
-          "<!(./bin/variables.sh ssl)",
-          "<!(./bin/variables.sh crypto)"
+          "<!(./bin/variables.sh ssl)"
         ],
         "ldflags": [
           "<!(./bin/variables.sh load_archive)"

diff --git a/docs/index.md b/docs/index.md
@@ -10,7 +10,7 @@ bitcore-node start
 Note: For your convenience, we distribute binaries for x86_64 Linux and x86_64 Mac OS X. Upon npm install, the binaries for your platform will be downloaded. For more detailed installation instructions, or if you want to compile the project yourself, then please see the [Build & Install](build.md) documentation to build the project from source.
 
 # Prerequisites
-- Node.js v0.12
+- Node.js v0.12 or v4.2
 - ~100GB of disk storage
 - ~4GB of RAM
 - Mac OS X >= 10.9, Ubuntu >= 12.04 (libc >= 2.15 and libstdc++ >= 6.0.16)

diff --git a/etc/bitcoin.patch b/etc/bitcoin.patch
@@ -79,6 +79,30 @@ index fd74aef..9c79637 100644
  LEVELDB_CPPFLAGS=
  LIBLEVELDB=
  LIBMEMENV=
+diff --git a/depends/hosts/linux.mk b/depends/hosts/linux.mk
+index b13a0f1..0513394 100644
+--- a/depends/hosts/linux.mk
++++ b/depends/hosts/linux.mk
+@@ -10,15 +10,15 @@ linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
+ linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
+
+ ifeq (86,$(findstring 86,$(build_arch)))
+-i686_linux_CC=gcc -m32
+-i686_linux_CXX=g++ -m32
++i686_linux_CC=${CC} -m32
++i686_linux_CXX=${CXX} -m32
+ i686_linux_AR=ar
+ i686_linux_RANLIB=ranlib
+ i686_linux_NM=nm
+ i686_linux_STRIP=strip
+
+-x86_64_linux_CC=gcc -m64
+-x86_64_linux_CXX=g++ -m64
++x86_64_linux_CC=${CC} -m64
++x86_64_linux_CXX=${CXX} -m64
+ x86_64_linux_AR=ar
+ x86_64_linux_RANLIB=ranlib
+ x86_64_linux_NM=nm
 diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk
 index 68841af..65a105b 100644
 --- a/depends/packages/bdb.mk

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "commander": "^2.8.1",
     "errno": "^0.1.4",
     "express": "^4.13.3",
-    "leveldown": "^1.4.1",
+    "leveldown": "^1.4.2",
     "levelup": "^1.2.1",
     "liftoff": "^2.2.0",
     "memdown": "^1.0.0",
@@ -78,7 +78,7 @@
     "bitcore-p2p": "~1.0.0"
   },
   "engines": {
-    "node": "^0.12"
+    "node": "^0.12 || ^4.2"
   },
   "os": [
     "darwin",