From 9c4f5b069bda54fe94fcdf54d3ddfc3643194b0f Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Fri, 4 Apr 2014 17:10:44 +0200 Subject: [PATCH 1/2] 8039030: 9-dev windows-i586 build failed with mktemp: command not found Reviewed-by: alanb, katleman --- common/autoconf/generated-configure.sh | 5 ++++- common/autoconf/toolchain_windows.m4 | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 120e944331f..49daece9891 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4243,7 +4243,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1396297437 +DATE_WHEN_GENERATED=1396624161 ############################################################################### # @@ -27449,6 +27449,9 @@ $as_echo "ok" >&6; } VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'` WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'` WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'` + # Remove any paths containing # (typically F#) as that messes up make. This + # is needed if visual studio was installed with F# support. + VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[^:#]*#[^:]*://g'` diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4 index 81d0a964a4d..b4888a46ac5 100644 --- a/common/autoconf/toolchain_windows.m4 +++ b/common/autoconf/toolchain_windows.m4 @@ -211,6 +211,9 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV], VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'` WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'` WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'` + # Remove any paths containing # (typically F#) as that messes up make. This + # is needed if visual studio was installed with F# support. + VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'` AC_SUBST(VS_PATH) AC_SUBST(VS_INCLUDE) From ffbb7125b25a88f4495d94c9c8fb25af89af1856 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Mon, 7 Apr 2014 10:59:50 +0200 Subject: [PATCH 2/2] 8035134: JDK9 unix debug bundle manifest file list issue Reviewed-by: ihse --- make/common/NativeCompilation.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index 6dabbb4f53e..1b513ad7ce2 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -482,7 +482,7 @@ define SetupNativeCompilation # to be rebuilt properly. $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET) $(CD) $$($1_OBJECT_DIR) \ - && $(ZIP) -q $$@ $$($1_DEBUGINFO_FILES) + && $(ZIP) -q $$@ $$(notdir $$($1_DEBUGINFO_FILES)) else $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES))