SKALE-1850 improved json libs build

jsonrpc/build.sh

@@ -33,26 +33,56 @@ else
 	CONF_DEBUG_OPTIONS=""
 fi
 
-git clone https://github.com/jonathanmarvens/argtable2.git
-cd argtable2
-mkdir -p build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=$TOP_CMAKE_BUILD_TYPE ..
-make
-make install
-cd ../..
+export OPENSSL_SRC_RELATIVE="../libBLS/deps/openssl"
+export OPENSSL_SRC=`$READLINK -f $OPENSSL_SRC_RELATIVE`
 
-tar -xzf ./pre_downloaded/jsoncpp.tar.gz
-cd jsoncpp
-mkdir -p build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=$TOP_CMAKE_BUILD_TYPE \
-	-DBUILD_SHARED_LIBS=NO \
-	-DBUILD_STATIC_LIBS=YES \
-	..
-make
-make install
-cd ../..
+# git clone https://github.com/jonathanmarvens/argtable2.git
+# cd argtable2
+# mkdir -p build
+# cd build
+# cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=$TOP_CMAKE_BUILD_TYPE ..
+# make
+# make install
+# cd ../..
+#
+# tar -xzf ./pre_downloaded/jsoncpp.tar.gz
+# cd jsoncpp
+# mkdir -p build
+# cd build
+# cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=$TOP_CMAKE_BUILD_TYPE \
+# 	-DBUILD_SHARED_LIBS=NO \
+# 	-DBUILD_STATIC_LIBS=YES \
+# 	..
+# make
+# make install
+# cd ../..
+
+# git clone https://github.com/curl/curl.git
+# tar -czf curl-from-git.tar.gz ./curl
+# cd curl
+# mkdir -p build
+# cd build
+# cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DOPENSSL_ROOT_DIR=$OPENSSL_SRC -DBUILD_CURL_EXE=OFF -DBUILD_TESTING=OFF -DCMAKE_USE_LIBSSH2=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_LDAP=ON -DCURL_STATICLIB=ON -DCMAKE_BUILD_TYPE=$TOP_CMAKE_BUILD_TYPE ..
+# echo " " >> lib/curl_config.h
+# echo "#define HAVE_POSIX_STRERROR_R 1" >> lib/curl_config.h
+# echo " " >> lib/curl_config.h
+# ### Set HAVE_POSIX_STRERROR_R to 1 in build/lib/curl_config.h
+# make
+# make install
+# cd ../..
+
+# git clone https://github.com/scottjg/libmicrohttpd.git
+# cd libmicrohttpd
+# MHD_HTTPS_OPT=""
+# if [ "$WITH_GCRYPT" = "yes" ];
+# then
+# 	MHD_HTTPS_OPT="--enable-https"
+# fi
+# ./bootstrap
+# ./configure --enable-static --disable-shared --with-pic --prefix=$INSTALL_ROOT $MHD_HTTPS_OPT
+# make
+# make install
+# cd ..
 
 tar -xzf ./pre_downloaded/libjson-rpc-cpp.tar.gz
 cd libjson-rpc-cpp

scripts/build.py

@@ -120,8 +120,8 @@ os.chdir(SSL_SOURCE_DIR)
 assert subprocess.call(["wget", "https://www.openssl.org/source/openssl-1.1.1b.tar.gz"]) == 0
 print "===>>> Making SSL  project"
 os.chdir(SSL_MAKE_DIR)
-assert subprocess.call(["make",   "SGX_SDK=" + SGX_SDK_DIR_SSL, "all", "test"]) == 0
-#assert subprocess.call(["make",   "SGX_SDK=" + SGX_SDK_DIR_SSL, "all" ]) == 0
+#assert subprocess.call(["make",   "SGX_SDK=" + SGX_SDK_DIR_SSL, "all", "test"]) == 0
+assert subprocess.call(["make",   "SGX_SDK=" + SGX_SDK_DIR_SSL, "all" ]) == 0
 
 os.chdir(JSON_LIBS_DIR)
 assert subprocess.call(["bash", "-c", "./build.sh"]) == 0