From d58ee95fe04c3534d58886d3291f5d8417941daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Mon, 21 Oct 2019 23:39:11 +0200
Subject: [PATCH 1/2] build_rocksdb.sh: use the NPROC env var for number of
 make jobs

---
 scripts/build_rocksdb.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/build_rocksdb.sh b/scripts/build_rocksdb.sh
index 73704a3..4c19b68 100755
--- a/scripts/build_rocksdb.sh
+++ b/scripts/build_rocksdb.sh
@@ -16,6 +16,10 @@ ROCKSDBVER="5.17.2"
 [[ $# -ne 1 ]] && { echo "usage: $0 ci_cache_dir"; exit 1; }
 CI_CACHE="$1" # here we cache the installed files
 
+# env vars
+
+[[ -z "$NPROC" ]] && NPROC=2 # number of CPU cores available
+
 # install from cache and exit, if the version we want is already there
 if [[ -n "$CI_CACHE" ]] && ls "$CI_CACHE"/lib/librocksdb* 2>/dev/null | grep -q "$ROCKSDBVER"; then
 	sudo cp -a "$CI_CACHE"/* /usr/local/
@@ -24,10 +28,10 @@ fi
 
 # build it
 echo "Building RocksDB"
-curl -O -L -s -S https://github.com/facebook/rocksdb/archive/v$ROCKSDBVER.tar.gz
-tar xzf v$ROCKSDBVER.tar.gz
-cd rocksdb-$ROCKSDBVER
-make DISABLE_WARNING_AS_ERROR=1 -j2 shared_lib
+curl -O -L -s -S https://github.com/facebook/rocksdb/archive/v${ROCKSDBVER}.tar.gz
+tar xzf v${ROCKSDBVER}.tar.gz
+cd rocksdb-${ROCKSDBVER}
+make DISABLE_WARNING_AS_ERROR=1 -j${NPROC} shared_lib
 
 # install it
 if [[ -n "../$CI_CACHE" ]]; then

From dee348f0fabe518c405fd7bf9180547caaa3a121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Wed, 23 Oct 2019 22:38:02 +0200
Subject: [PATCH 2/2] build_nim.sh: bump csources and Nimble target commits

so they work with the latest Nim in https://github.com/status-im/Nim
("use the latest...") strategy employed by projects other than Nimbus
and nim-beacon-chain
---
 scripts/build_nim.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build_nim.sh b/scripts/build_nim.sh
index 3265191..0bb18e9 100755
--- a/scripts/build_nim.sh
+++ b/scripts/build_nim.sh
@@ -11,8 +11,8 @@
 set -e
 
 # Git commits
-CSOURCES_COMMIT="b56e49bbedf62db22eb26388f98262e2948b2cbc" # 0.19.0
-NIMBLE_COMMIT="c8d79fc0228682677330a9f57d14389aaa641153" # Mar 26 10:06:06 2019
+CSOURCES_COMMIT="f72f471adb743bea4f8d8c59d19aa1cb885dcc59" # 0.20.0
+NIMBLE_COMMIT="4007b2a778429a978e12307bf13a038029b4c4d9" # 0.11.0
 
 # script arguments
 [[ $# -ne 4 ]] && { echo "usage: $0 nim_dir csources_dir nimble_dir ci_cache_dir"; exit 1; }