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

8189619: [aix] OpenJDK local disk check not working on AIX

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Stewart X Addison 2017-10-20 13:10:35 +02:00 committed by Thomas Stuefe
parent 1dca1fb4e1
commit 5e00c162bd
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/autoconf/basics.m4
View File

@ -1160,7 +1160,15 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
$2
fi
else
if $DF -l $1 > /dev/null 2>&1; then
# JDK-8189619
# df on AIX does not understand -l. On modern AIXes it understands "-T local" which
# is the same. On older AIXes we just continue to live with a "not local build" warning.
if test "x$OPENJDK_TARGET_OS" = xaix; then
DF_LOCAL_ONLY_OPTION='-T local'
else
DF_LOCAL_ONLY_OPTION='-l'
fi
if $DF $DF_LOCAL_ONLY_OPTION $1 > /dev/null 2>&1; then
$2
else
$3

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

@ -5114,7 +5114,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1508415370
DATE_WHEN_GENERATED=1508497666
###############################################################################
#
@ -67755,7 +67755,15 @@ $as_echo_n "checking if build directory is on local disk... " >&6; }
OUTPUT_DIR_IS_LOCAL="yes"
fi
else
if $DF -l $OUTPUTDIR > /dev/null 2>&1; then
# JDK-8189619
# df on AIX does not understand -l. On modern AIXes it understands "-T local" which
# is the same. On older AIXes we just continue to live with a "not local build" warning.
if test "x$OPENJDK_TARGET_OS" = xaix; then
DF_LOCAL_ONLY_OPTION='-T local'
else
DF_LOCAL_ONLY_OPTION='-l'
fi
if $DF $DF_LOCAL_ONLY_OPTION $OUTPUTDIR > /dev/null 2>&1; then
OUTPUT_DIR_IS_LOCAL="yes"
else
OUTPUT_DIR_IS_LOCAL="no"