From 36bf6fbe0839cebce5e66ba680a73353703152aa Mon Sep 17 00:00:00 2001 From: Matthias Baesken <mbaesken@openjdk.org> Date: Thu, 28 Apr 2022 13:33:32 +0000 Subject: [PATCH] 8285728: Alpine Linux build fails with busybox tar Reviewed-by: erikj, stuefe --- make/autoconf/basic_tools.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4 index b95045dc966..56e76f3def9 100644 --- a/make/autoconf/basic_tools.m4 +++ b/make/autoconf/basic_tools.m4 @@ -269,6 +269,8 @@ AC_DEFUN([BASIC_CHECK_TAR], TAR_TYPE="bsd" elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then TAR_TYPE="bsd" + elif test "x$($TAR --version | $GREP "busybox")" != "x"; then + TAR_TYPE="busybox" elif test "x$OPENJDK_BUILD_OS" = "xaix"; then TAR_TYPE="aix" fi @@ -280,9 +282,12 @@ AC_DEFUN([BASIC_CHECK_TAR], TAR_SUPPORTS_TRANSFORM="true" elif test "x$TAR_TYPE" = "aix"; then # -L InputList of aix tar: name of file listing the files and directories - # that need to be archived or extracted + # that need to be archived or extracted TAR_INCLUDE_PARAM="L" TAR_SUPPORTS_TRANSFORM="false" + elif test "x$TAR_TYPE" = "xbusybox"; then + TAR_INCLUDE_PARAM="T" + TAR_SUPPORTS_TRANSFORM="false" else TAR_INCLUDE_PARAM="I" TAR_SUPPORTS_TRANSFORM="false"