This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new ee7290c HADOOP-16359. Bundle ZSTD native in branch-2. Contributed by
Chao Sun.
ee7290c is described below
commit ee7290c93bb29286b2e17e792e9a43790025c452
Author: Chao Sun <[email protected]>
AuthorDate: Fri Jun 14 15:19:06 2019 -0700
HADOOP-16359. Bundle ZSTD native in branch-2. Contributed by Chao Sun.
Signed-off-by: Wei-Chiu Chuang <[email protected]>
(cherry picked from commit 9ab3cbf4d3b17fe56127c27866f5f722088bdd8b)
---
dev-support/bin/dist-copynativelibs | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/dev-support/bin/dist-copynativelibs
b/dev-support/bin/dist-copynativelibs
index 61817ed..c814689 100755
--- a/dev-support/bin/dist-copynativelibs
+++ b/dev-support/bin/dist-copynativelibs
@@ -108,7 +108,14 @@ for i in "$@"; do
--snappylibbundle=*)
SNAPPYLIBBUNDLE=${i#*=}
;;
-
+ --zstdbinbundle=*)
+ ZSTDBINBUNDLE=${i#*=}
+ ;;
+ --zstdlib=*)
+ ZSTDLIB=${i#*=}
+ ;;
+ --zstdlibbundle=*)
+ ZSTDLIBBUNDLE=${i#*=}
esac
done
@@ -133,6 +140,8 @@ if [[ -d "${LIB_DIR}" ]]; then
bundle_native_lib "${SNAPPYLIBBUNDLE}" "snappy.lib" "snappy" "${SNAPPYLIB}"
+ bundle_native_lib "${ZSTDLIBBUNDLE}" "zstd.lib" "zstd" "${ZSTDLIB}"
+
bundle_native_lib "${OPENSSLLIBBUNDLE}" "openssl.lib" "crypto"
"${OPENSSLLIB}"
fi
@@ -151,6 +160,8 @@ if [[ -d "${BIN_DIR}" ]] ; then
bundle_native_bin "${SNAPPYBINBUNDLE}" "${SNAPPYLIBBUNDLE}" "snappy.lib"
"snappy" "${SNAPPYLIB}"
+ bundle_native_bin "${ZSTDBINBUNDLE}" "${ZSTDLIBBUNDLE}" "zstd.lib" "zstd"
"${ZSTDLIB}"
+
bundle_native_bin "${OPENSSLBINBUNDLE}" "${OPENSSLLIBBUNDLE}" "openssl.lib"
"crypto" "${OPENSSLLIB}"
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
