changeset 47548:7236260e166c

8189619: [aix] OpenJDK local disk check not working on AIX Reviewed-by: erikj Contributed-by: sxa@uk.ibm.com
author stuefe
date Fri, 20 Oct 2017 13:10:35 +0200
parents 911983f9df61
children 1fd27535bc57
files make/autoconf/basics.m4 make/autoconf/generated-configure.sh
diffstat 2 files changed, 19 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/autoconf/basics.m4	Thu Aug 31 08:45:18 2017 +0200
+++ b/make/autoconf/basics.m4	Fri Oct 20 13:10:35 2017 +0200
@@ -1160,7 +1160,15 @@
       $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
--- a/make/autoconf/generated-configure.sh	Thu Aug 31 08:45:18 2017 +0200
+++ b/make/autoconf/generated-configure.sh	Fri Oct 20 13:10:35 2017 +0200
@@ -5114,7 +5114,7 @@
 #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 @@
       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"