stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8157479: jdk-9_solaris-x64_bin-debug.tar.gz error - typeflag 'L' not recognized

Browse Source 
Reviewed-by: tbell, dmalav
This commit is contained in:
Erik Joelsson 2016-06-03 18:04:38 +02:00
parent 3461be0dc2
commit f900ad6e42
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/autoconf/basics.m4
View File

@ -1022,13 +1022,21 @@ AC_DEFUN([BASIC_CHECK_TAR],
AC_MSG_CHECKING([what type of tar was found]) AC_MSG_CHECKING([what type of tar was found])
AC_MSG_RESULT([$TAR_TYPE]) AC_MSG_RESULT([$TAR_TYPE])
TAR_CREATE_FILE_PARAM=""
if test "x$TAR_TYPE" = "xgnu"; then if test "x$TAR_TYPE" = "xgnu"; then
TAR_INCLUDE_PARAM="T" TAR_INCLUDE_PARAM="T"
TAR_SUPPORTS_TRANSFORM="true" TAR_SUPPORTS_TRANSFORM="true"
if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
# When using gnu tar for Solaris targets, need to use compatibility mode
TAR_CREATE_EXTRA_PARAM="--format=ustar"
fi
else else
TAR_INCLUDE_PARAM="I" TAR_INCLUDE_PARAM="I"
TAR_SUPPORTS_TRANSFORM="false" TAR_SUPPORTS_TRANSFORM="false"
fi fi
AC_SUBST(TAR_TYPE)
AC_SUBST(TAR_CREATE_EXTRA_PARAM)
AC_SUBST(TAR_INCLUDE_PARAM) AC_SUBST(TAR_INCLUDE_PARAM)
AC_SUBST(TAR_SUPPORTS_TRANSFORM) AC_SUBST(TAR_SUPPORTS_TRANSFORM)
]) ])

12
common/autoconf/generated-configure.sh
View File

@ -953,6 +953,8 @@ ZIP
UNZIP UNZIP
TAR_SUPPORTS_TRANSFORM TAR_SUPPORTS_TRANSFORM
TAR_INCLUDE_PARAM TAR_INCLUDE_PARAM
TAR_CREATE_EXTRA_PARAM
TAR_TYPE
FIND_DELETE FIND_DELETE
OUTPUT_SYNC OUTPUT_SYNC
OUTPUT_SYNC_SUPPORTED OUTPUT_SYNC_SUPPORTED
@ -5092,7 +5094,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1464173584 DATE_WHEN_GENERATED=1464969763
############################################################################### ###############################################################################
# #
@ -21172,9 +21174,15 @@ $as_echo_n "checking what type of tar was found... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR_TYPE" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR_TYPE" >&5
$as_echo "$TAR_TYPE" >&6; } $as_echo "$TAR_TYPE" >&6; }
TAR_CREATE_FILE_PARAM=""
if test "x$TAR_TYPE" = "xgnu"; then if test "x$TAR_TYPE" = "xgnu"; then
TAR_INCLUDE_PARAM="T" TAR_INCLUDE_PARAM="T"
TAR_SUPPORTS_TRANSFORM="true" TAR_SUPPORTS_TRANSFORM="true"
if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
# When using gnu tar for Solaris targets, need to use compatibility mode
TAR_CREATE_EXTRA_PARAM="--format=ustar"
fi
else else
TAR_INCLUDE_PARAM="I" TAR_INCLUDE_PARAM="I"
TAR_SUPPORTS_TRANSFORM="false" TAR_SUPPORTS_TRANSFORM="false"
@ -21183,6 +21191,8 @@ $as_echo "$TAR_TYPE" >&6; }
# These tools might not be installed by default, # These tools might not be installed by default,
# need hint on how to install them. # need hint on how to install them.

2
common/autoconf/spec.gmk.in
View File

@ -687,6 +687,8 @@ XCODEBUILD=@XCODEBUILD@
DTRACE := @DTRACE@ DTRACE := @DTRACE@
FIXPATH:=@FIXPATH@ FIXPATH:=@FIXPATH@
TAR_TYPE:=@TAR_TYPE@
TAR_CREATE_EXTRA_PARAM:=@TAR_CREATE_EXTRA_PARAM@
TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@ TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@ TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@

9
make/Bundles.gmk
View File

@ -77,7 +77,8 @@ define SetupBundleFileBody
ifneq ($$($1_SUBDIR), ) ifneq ($$($1_SUBDIR), )
ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false) ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false)
$(CD) $$($1_BASE_DIR) \ $(CD) $$($1_BASE_DIR) \
&& ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
--transform 's|^|$$($1_SUBDIR)/|' $(TAR_IGNORE_EXIT_VALUE) ) \ --transform 's|^|$$($1_SUBDIR)/|' $(TAR_IGNORE_EXIT_VALUE) ) \
| $(GZIP) > $$@ | $(GZIP) > $$@
else else
@ -97,7 +98,8 @@ define SetupBundleFileBody
endif endif
ifeq ($$($1_TYPE), tar.gz) ifeq ($$($1_TYPE), tar.gz)
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \ $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
( $(TAR) cf - $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) | $(GZIP) > $$@ ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) \
| $(GZIP) > $$@
else ifeq ($$($1_TYPE), zip) else ifeq ($$($1_TYPE), zip)
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIP) -qr $$@ . $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIP) -qr $$@ .
endif endif
@ -105,7 +107,8 @@ define SetupBundleFileBody
else else
ifeq ($$($1_TYPE), tar.gz) ifeq ($$($1_TYPE), tar.gz)
$(CD) $$($1_BASE_DIR) \ $(CD) $$($1_BASE_DIR) \
&& ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
$(TAR_IGNORE_EXIT_VALUE) ) \ $(TAR_IGNORE_EXIT_VALUE) ) \
| $(GZIP) > $$@ | $(GZIP) > $$@
else ifeq ($$($1_TYPE), zip) else ifeq ($$($1_TYPE), zip)