From 023fa3874200a88d52b1602fbd17467605801d7e Mon Sep 17 00:00:00 2001 From: stu1130 Date: Mon, 29 Apr 2019 13:03:22 -0700 Subject: [PATCH 1/4] upgrade openssl to 1.1.0k --- tools/dependencies/openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dependencies/openssl.sh b/tools/dependencies/openssl.sh index 8e2372c9075a..875dd8b01324 100755 --- a/tools/dependencies/openssl.sh +++ b/tools/dependencies/openssl.sh @@ -19,7 +19,7 @@ # This script builds the static library of openssl that can be used as dependency of mxnet. set -ex -OPENSSL_VERSION=1.0.2l +OPENSSL_VERSION=1.1.0k if [[ ! -f $DEPS_PATH/lib/libssl.a ]] || [[ ! -f $DEPS_PATH/lib/libcrypto.a ]]; then # download and build openssl >&2 echo "Building openssl..." From e6639175dabe00010e6825cf151dcf9a82269f75 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Mon, 29 Apr 2019 15:39:00 -0700 Subject: [PATCH 2/4] fix the wrong version --- tools/dependencies/openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dependencies/openssl.sh b/tools/dependencies/openssl.sh index 875dd8b01324..065e7e0348b3 100755 --- a/tools/dependencies/openssl.sh +++ b/tools/dependencies/openssl.sh @@ -19,7 +19,7 @@ # This script builds the static library of openssl that can be used as dependency of mxnet. set -ex -OPENSSL_VERSION=1.1.0k +OPENSSL_VERSION=1.1.0j if [[ ! -f $DEPS_PATH/lib/libssl.a ]] || [[ ! -f $DEPS_PATH/lib/libcrypto.a ]]; then # download and build openssl >&2 echo "Building openssl..." From ed2ce8485d5d2aeb6b2ff070b9ca49c3dab94177 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 1 May 2019 10:10:09 -0700 Subject: [PATCH 3/4] upgrade to the latest version --- tools/dependencies/openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dependencies/openssl.sh b/tools/dependencies/openssl.sh index 065e7e0348b3..78673a3ac84b 100755 --- a/tools/dependencies/openssl.sh +++ b/tools/dependencies/openssl.sh @@ -19,7 +19,7 @@ # This script builds the static library of openssl that can be used as dependency of mxnet. set -ex -OPENSSL_VERSION=1.1.0j +OPENSSL_VERSION=1.1.1b if [[ ! -f $DEPS_PATH/lib/libssl.a ]] || [[ ! -f $DEPS_PATH/lib/libcrypto.a ]]; then # download and build openssl >&2 echo "Building openssl..." From 905127c3c30da4efcf846ff9106ff8bc3ba77ad5 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 1 May 2019 14:14:17 -0700 Subject: [PATCH 4/4] avoid lib to be treated as file instead of folder --- tools/staticbuild/build_lib.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/staticbuild/build_lib.sh b/tools/staticbuild/build_lib.sh index 472bf57b101e..927c15d1dabc 100755 --- a/tools/staticbuild/build_lib.sh +++ b/tools/staticbuild/build_lib.sh @@ -44,6 +44,9 @@ if [[ $VARIANT == *mkl ]]; then MKLDNN_LIBFILE='libmkldnn.0.dylib' fi $MAKE DEPS_PATH=$DEPS_PATH mkldnn + if [ ! -d lib ]; then + mkdir lib + fi cp 3rdparty/mkldnn/build/install/lib/$IOMP_LIBFILE lib cp 3rdparty/mkldnn/build/install/lib/$MKLML_LIBFILE lib cp 3rdparty/mkldnn/build/install/lib/$MKLDNN_LIBFILE lib