Skip to content

Commit ccca5f4

Browse files
committed
HADOOP-16441. if use -Dbundle.openssl=true, bundled with unnecessary libk5crypto.*. Contributed by KWON BYUNGCHANG.
1 parent 54e7605 commit ccca5f4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

dev-support/bin/dist-copynativelibs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function bundle_native_bin
7272
fi
7373

7474
cd "${libdir}" || exit 1
75-
${TAR} ./*"${libpattern}"* | (cd "${TARGET_BIN_DIR}"/ || exit 1 ; ${UNTAR})
75+
${TAR} ./*"${binpattern}"* | (cd "${TARGET_BIN_DIR}"/ || exit 1 ; ${UNTAR})
7676
if [[ $? -ne 0 ]]; then
7777
echo "Bundling bin files for ${binoption} failed"
7878
exit 1
@@ -152,13 +152,13 @@ if [[ -d "${LIB_DIR}" ]]; then
152152
exit 1
153153
fi
154154

155-
bundle_native_lib "${SNAPPYLIBBUNDLE}" "snappy.lib" "snappy" "${SNAPPYLIB}"
155+
bundle_native_lib "${SNAPPYLIBBUNDLE}" "snappy.lib" "libsnappy." "${SNAPPYLIB}"
156156

157-
bundle_native_lib "${ZSTDLIBBUNDLE}" "zstd.lib" "zstd" "${ZSTDLIB}"
157+
bundle_native_lib "${ZSTDLIBBUNDLE}" "zstd.lib" "libzstd." "${ZSTDLIB}"
158158

159-
bundle_native_lib "${OPENSSLLIBBUNDLE}" "openssl.lib" "crypto" "${OPENSSLLIB}"
159+
bundle_native_lib "${OPENSSLLIBBUNDLE}" "openssl.lib" "libcrypto." "${OPENSSLLIB}"
160160

161-
bundle_native_lib "${ISALBUNDLE}" "isal.lib" "isa" "${ISALLIB}"
161+
bundle_native_lib "${ISALBUNDLE}" "isal.lib" "libisal." "${ISALLIB}"
162162

163163
bundle_native_lib "${PMDKBUNDLE}" "pmdk.lib" "pmdk" "${PMDKLIB}"
164164
fi

0 commit comments

Comments
 (0)