Mercurial > hg > openjdk > jdk9
changeset 2117:f80c841ae254 jdk-9+124
Merge
author | lana |
---|---|
date | Thu, 16 Jun 2016 20:56:39 +0000 |
parents | 5244c79bbc9a (current diff) 9169d65592c9 (diff) |
children | c0591972ccee a420707436c6 |
files | |
diffstat | 4 files changed, 27 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/basics.m4 Thu Jun 16 19:07:26 2016 +0000 +++ b/common/autoconf/basics.m4 Thu Jun 16 20:56:39 2016 +0000 @@ -1022,13 +1022,21 @@ AC_MSG_CHECKING([what type of tar was found]) AC_MSG_RESULT([$TAR_TYPE]) + TAR_CREATE_FILE_PARAM="" + if test "x$TAR_TYPE" = "xgnu"; then TAR_INCLUDE_PARAM="T" 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 TAR_INCLUDE_PARAM="I" TAR_SUPPORTS_TRANSFORM="false" fi + AC_SUBST(TAR_TYPE) + AC_SUBST(TAR_CREATE_EXTRA_PARAM) AC_SUBST(TAR_INCLUDE_PARAM) AC_SUBST(TAR_SUPPORTS_TRANSFORM) ])
--- a/common/autoconf/generated-configure.sh Thu Jun 16 19:07:26 2016 +0000 +++ b/common/autoconf/generated-configure.sh Thu Jun 16 20:56:39 2016 +0000 @@ -953,6 +953,8 @@ UNZIP TAR_SUPPORTS_TRANSFORM TAR_INCLUDE_PARAM +TAR_CREATE_EXTRA_PARAM +TAR_TYPE FIND_DELETE OUTPUT_SYNC OUTPUT_SYNC_SUPPORTED @@ -5092,7 +5094,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1465306933 +DATE_WHEN_GENERATED=1466007828 ############################################################################### # @@ -21172,9 +21174,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR_TYPE" >&5 $as_echo "$TAR_TYPE" >&6; } + TAR_CREATE_FILE_PARAM="" + if test "x$TAR_TYPE" = "xgnu"; then TAR_INCLUDE_PARAM="T" 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 TAR_INCLUDE_PARAM="I" TAR_SUPPORTS_TRANSFORM="false" @@ -21183,6 +21191,8 @@ + + # These tools might not be installed by default, # need hint on how to install them.
--- a/common/autoconf/spec.gmk.in Thu Jun 16 19:07:26 2016 +0000 +++ b/common/autoconf/spec.gmk.in Thu Jun 16 20:56:39 2016 +0000 @@ -687,6 +687,8 @@ DTRACE := @DTRACE@ FIXPATH:=@FIXPATH@ +TAR_TYPE:=@TAR_TYPE@ +TAR_CREATE_EXTRA_PARAM:=@TAR_CREATE_EXTRA_PARAM@ TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@ TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
--- a/make/Bundles.gmk Thu Jun 16 19:07:26 2016 +0000 +++ b/make/Bundles.gmk Thu Jun 16 20:56:39 2016 +0000 @@ -77,7 +77,8 @@ ifneq ($$($1_SUBDIR), ) ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false) $(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) ) \ | $(GZIP) > $$@ else @@ -97,7 +98,8 @@ endif ifeq ($$($1_TYPE), tar.gz) $(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) $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIP) -qr $$@ . endif @@ -105,7 +107,8 @@ else ifeq ($$($1_TYPE), tar.gz) $(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) ) \ | $(GZIP) > $$@ else ifeq ($$($1_TYPE), zip)