Release ndk 0.10.1.

Signed-off-by: Vincenzo Palazzo <[email protected]>

# Title: 

Signed-off-by: Vincenzo Palazzo <[email protected]>

buildenv.sh

@@ -30,11 +30,11 @@ fi
 export NDKARCH=${NDKARCH}
 export BUILD=${BUILD}
 
-num_jobs=4
+num_jobs=$(nproc)
 if [ -f /proc/cpuinfo ]; then
     num_jobs=$(grep ^processor /proc/cpuinfo | wc -l)
 fi
 export NUM_JOBS${num_jobs}
 
 export BUILDROOT=$PWD/build_root
-mkdir -p $BUILDROOT
+mkdir -p $BUILDROOT

buildlightning.sh

@@ -2,11 +2,13 @@
 set -eo pipefail
 
 REPOPATH=$PWD
+CLIGHTNING_VERSION=v0.10.1
+ESPLORA_VERSION=v0.2
 
 # download lightning
 git clone https://github.com/ElementsProject/lightning.git lightning
 cd lightning
-git checkout v0.10.0
+git checkout $CLIGHTNING_VERSION
 
 # set virtualenv for lightning
 python3 -m virtualenv venv
@@ -34,10 +36,11 @@ patch -p1 < ${REPOPATH}/lightning-addr.patch
 patch -p1 < ${REPOPATH}/lightning-endian.patch
 
 # add esplora plugin
-git clone https://github.com/lvaccaro/esplora_clnd_plugin.git
-cd esplora_clnd_plugin && git checkout master && cd ..
+git clone https://github.com/clightning4j/esplora_clnd_plugin.git
+cd esplora_clnd_plugin && git checkout $ESPLORA_VERSION && cd ..
 cp esplora_clnd_plugin/esplora.c plugins/
 sed -i 's/LDLIBS = /LDLIBS = -lcurl -lssl -lcrypto /g' Makefile
+#sed -i -e '/LDLIBS =/s/$/ -L${BUILDROOT}\/lib\/ -lcurl -lssl -lcrypto/' Makefile
 patch -p1 < esplora_clnd_plugin/Makefile.patch
 
 # build external libraries and source

lightning-config.h

@@ -83,6 +83,7 @@
 #define HAVE_GCC 0
 #define HAVE_MODERN_GCC 0
 #define HAVE_PWRITEV 0
+#define HAVE_ATTRIBUTE_RETURNS_NONNULL 1
 #endif /* CCAN_CONFIG_H */
 #define DEVELOPER 0
 #define EXPERIMENTAL_FEATURES 0

lightning-config.vars

@@ -72,6 +72,7 @@ HAVE_POSTGRES=0
 HAVE_GCC=0
 HAVE_MODERN_GCC=0
 HAVE_PWRITEV=0
+HAVE_ATTRIBUTE_RETURNS_NONNULL=1
 PREFIX=BUILDROOT
 CC=NDKCOMPILER
 CONFIGURATOR_CC=/usr/bin/gcc