You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by iw...@apache.org on 2019/12/04 05:26:55 UTC
[hadoop] branch trunk updated: HADOOP-16441. if use
-Dbundle.openssl=true,
bundled with unnecessary libk5crypto.*. Contributed by KWON BYUNGCHANG.
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new ccca5f4 HADOOP-16441. if use -Dbundle.openssl=true, bundled with unnecessary libk5crypto.*. Contributed by KWON BYUNGCHANG.
ccca5f4 is described below
commit ccca5f4a404c02f27997b19bbc679b1d7d2c127f
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Wed Dec 4 14:25:46 2019 +0900
HADOOP-16441. if use -Dbundle.openssl=true, bundled with unnecessary libk5crypto.*. Contributed by KWON BYUNGCHANG.
---
dev-support/bin/dist-copynativelibs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-support/bin/dist-copynativelibs b/dev-support/bin/dist-copynativelibs
index 4a783f0..ffc82b8 100755
--- a/dev-support/bin/dist-copynativelibs
+++ b/dev-support/bin/dist-copynativelibs
@@ -72,7 +72,7 @@ function bundle_native_bin
fi
cd "${libdir}" || exit 1
- ${TAR} ./*"${libpattern}"* | (cd "${TARGET_BIN_DIR}"/ || exit 1 ; ${UNTAR})
+ ${TAR} ./*"${binpattern}"* | (cd "${TARGET_BIN_DIR}"/ || exit 1 ; ${UNTAR})
if [[ $? -ne 0 ]]; then
echo "Bundling bin files for ${binoption} failed"
exit 1
@@ -152,13 +152,13 @@ if [[ -d "${LIB_DIR}" ]]; then
exit 1
fi
- bundle_native_lib "${SNAPPYLIBBUNDLE}" "snappy.lib" "snappy" "${SNAPPYLIB}"
+ bundle_native_lib "${SNAPPYLIBBUNDLE}" "snappy.lib" "libsnappy." "${SNAPPYLIB}"
- bundle_native_lib "${ZSTDLIBBUNDLE}" "zstd.lib" "zstd" "${ZSTDLIB}"
+ bundle_native_lib "${ZSTDLIBBUNDLE}" "zstd.lib" "libzstd." "${ZSTDLIB}"
- bundle_native_lib "${OPENSSLLIBBUNDLE}" "openssl.lib" "crypto" "${OPENSSLLIB}"
+ bundle_native_lib "${OPENSSLLIBBUNDLE}" "openssl.lib" "libcrypto." "${OPENSSLLIB}"
- bundle_native_lib "${ISALBUNDLE}" "isal.lib" "isa" "${ISALLIB}"
+ bundle_native_lib "${ISALBUNDLE}" "isal.lib" "libisal." "${ISALLIB}"
bundle_native_lib "${PMDKBUNDLE}" "pmdk.lib" "pmdk" "${PMDKLIB}"
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org