Skip to content

Commit

Permalink
Merge pull request #712 from ibmruntimes/openj9
Browse files Browse the repository at this point in the history
Merge jdk8u402-b03 to 0.43
  • Loading branch information
JasonFengJ9 authored Nov 24, 2023
2 parents d4e21db + 5a3af11 commit eace220
Show file tree
Hide file tree
Showing 15 changed files with 1,369 additions and 1,838 deletions.
1,389 changes: 0 additions & 1,389 deletions README-builds.html

This file was deleted.

2 changes: 1 addition & 1 deletion closed/openjdk-tag.gmk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OPENJDK_TAG := jdk8u402-b02
OPENJDK_TAG := jdk8u402-b03
1 change: 1 addition & 0 deletions common/autoconf/basics.m4
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
BASIC_PATH_PROGS(DF, df)
BASIC_PATH_PROGS(SETFILE, SetFile)
BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
BASIC_PATH_PROGS(PANDOC, pandoc)
])

# Setup basic configuration paths, and platform-specific stuff related to PATHs.
Expand Down
191 changes: 190 additions & 1 deletion common/autoconf/generated-configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,7 @@ build_os
build_vendor
build_cpu
build
PANDOC
CPIO
SETFILE
DF
Expand Down Expand Up @@ -1181,6 +1182,7 @@ READLINK
DF
SETFILE
CPIO
PANDOC
UNZIP
ZIP
LDD
Expand Down Expand Up @@ -2083,6 +2085,7 @@ Some influential environment variables:
DF Override default value for DF
SETFILE Override default value for SETFILE
CPIO Override default value for CPIO
PANDOC Override default value for PANDOC
UNZIP Override default value for UNZIP
ZIP Override default value for ZIP
LDD Override default value for LDD
Expand Down Expand Up @@ -4464,7 +4467,7 @@ VS_TOOLSET_SUPPORTED_2022=true
#CUSTOM_AUTOCONF_INCLUDE

# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1694614546
DATE_WHEN_GENERATED=1700680489

###############################################################################
#
Expand Down Expand Up @@ -13524,6 +13527,192 @@ $as_echo "$tool_specified" >&6; }



# Publish this variable in the help.


if test "x$PANDOC" = x; then
# The variable is not set by user, try to locate tool using the code snippet
for ac_prog in pandoc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PANDOC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PANDOC in
[\\/]* | ?:[\\/]*)
ac_cv_path_PANDOC="$PANDOC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PANDOC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

;;
esac
fi
PANDOC=$ac_cv_path_PANDOC
if test -n "$PANDOC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANDOC" >&5
$as_echo "$PANDOC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


test -n "$PANDOC" && break
done

else
# The variable is set, but is it from the command line or the environment?

# Try to remove the string !PANDOC! from our list.
try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!PANDOC!/}
if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
# If it failed, the variable was not from the command line. Ignore it,
# but warn the user (except for BASH, which is always set by the calling BASH).
if test "xPANDOC" != xBASH; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of PANDOC from the environment. Use command line variables instead." >&5
$as_echo "$as_me: WARNING: Ignoring value of PANDOC from the environment. Use command line variables instead." >&2;}
fi
# Try to locate tool using the code snippet
for ac_prog in pandoc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PANDOC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PANDOC in
[\\/]* | ?:[\\/]*)
ac_cv_path_PANDOC="$PANDOC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PANDOC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

;;
esac
fi
PANDOC=$ac_cv_path_PANDOC
if test -n "$PANDOC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANDOC" >&5
$as_echo "$PANDOC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


test -n "$PANDOC" && break
done

else
# If it succeeded, then it was overridden by the user. We will use it
# for the tool.

# First remove it from the list of overridden variables, so we can test
# for unknown variables in the end.
CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"

# Check if the provided tool contains a complete path.
tool_specified="$PANDOC"
tool_basename="${tool_specified##*/}"
if test "x$tool_basename" = "x$tool_specified"; then
# A command without a complete path is provided, search $PATH.
{ $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool PANDOC=$tool_basename" >&5
$as_echo "$as_me: Will search for user supplied tool PANDOC=$tool_basename" >&6;}
# Extract the first word of "$tool_basename", so it can be a program name with args.
set dummy $tool_basename; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PANDOC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PANDOC in
[\\/]* | ?:[\\/]*)
ac_cv_path_PANDOC="$PANDOC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PANDOC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

;;
esac
fi
PANDOC=$ac_cv_path_PANDOC
if test -n "$PANDOC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANDOC" >&5
$as_echo "$PANDOC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


if test "x$PANDOC" = x; then
as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
fi
else
# Otherwise we believe it is a complete path. Use it as it is.
{ $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool PANDOC=$tool_specified" >&5
$as_echo "$as_me: Will use user supplied tool PANDOC=$tool_specified" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANDOC" >&5
$as_echo_n "checking for PANDOC... " >&6; }
if test ! -x "$tool_specified"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
as_fn_error $? "User supplied tool PANDOC=$tool_specified does not exist or is not executable" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
$as_echo "$tool_specified" >&6; }
fi
fi
fi




# Now we can determine OpenJDK build and target platforms. This is required to
# have early on.
# Make sure we can run config.sub.
Expand Down
1 change: 1 addition & 0 deletions common/autoconf/spec.gmk.in
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ LN:=@LN@
MKDIR:=@MKDIR@
MV:=@MV@
NAWK:=@NAWK@
PANDOC:=@PANDOC@
PRINTF:=@PRINTF@
PWD:=@THEPWDCMD@
RM:=@RM@
Expand Down
62 changes: 0 additions & 62 deletions common/bin/update-build-readme.sh

This file was deleted.

14 changes: 0 additions & 14 deletions corba/README

This file was deleted.

Loading

0 comments on commit eace220

Please sign in to comment.