Print this page


Split Close
Expand all
Collapse all
          --- old/common/autoconf/generated-configure.sh
          +++ new/common/autoconf/generated-configure.sh
↓ open down ↓ 5087 lines elided ↑ open up ↑
5088 5088  
5089 5089  
5090 5090  
5091 5091  
5092 5092  # This line needs to be here, verbatim, after all includes and the dummy hook
5093 5093  # definitions. It is replaced with custom functionality when building
5094 5094  # custom sources.
5095 5095  #CUSTOM_AUTOCONF_INCLUDE
5096 5096  
5097 5097  # Do not change or remove the following line, it is needed for consistency checks:
5098      -DATE_WHEN_GENERATED=1470863189
     5098 +DATE_WHEN_GENERATED=1472744188
5099 5099  
5100 5100  ###############################################################################
5101 5101  #
5102 5102  # Initialization / Boot-strapping
5103 5103  #
5104 5104  # The bootstrapping process needs to solve the "chicken or the egg" problem,
5105 5105  # thus it jumps back and forth, each time gaining something needed later on.
5106 5106  #
5107 5107  ###############################################################################
5108 5108  
↓ open down ↓ 12093 lines elided ↑ open up ↑
17202 17202  
17203 17203    if test "x$EXTRA_PATH" != x; then
17204 17204      if test "x$PATH" = x; then
17205 17205        PATH="$EXTRA_PATH"
17206 17206      else
17207 17207        PATH="$EXTRA_PATH:$PATH"
17208 17208      fi
17209 17209    fi
17210 17210  
17211 17211  
17212      -  if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
17213      -    # Add extra search paths on solaris for utilities like ar, as, dtrace etc...
17214      -    PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin:/usr/sbin"
17215      -  fi
17216      -
17217 17212    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17218 17213  $as_echo_n "checking for sysroot... " >&6; }
17219 17214    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSROOT" >&5
17220 17215  $as_echo "$SYSROOT" >&6; }
17221 17216    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for toolchain path" >&5
17222 17217  $as_echo_n "checking for toolchain path... " >&6; }
17223 17218    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLCHAIN_PATH" >&5
17224 17219  $as_echo "$TOOLCHAIN_PATH" >&6; }
17225 17220    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra path" >&5
17226 17221  $as_echo_n "checking for extra path... " >&6; }
↓ open down ↓ 14237 lines elided ↑ open up ↑
31464 31459  
31465 31460    if test "x$SYSROOT" != "x"; then
31466 31461      if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
31467 31462        if test "x$OPENJDK_TARGET_OS" = xsolaris; then
31468 31463          # Solaris Studio does not have a concept of sysroot. Instead we must
31469 31464          # make sure the default include and lib dirs are appended to each
31470 31465          # compile and link command line. Must also add -I-xbuiltin to enable
31471 31466          # inlining of system functions and intrinsics.
31472 31467          SYSROOT_CFLAGS="-I-xbuiltin -I$SYSROOT/usr/include"
31473 31468          SYSROOT_LDFLAGS="-L$SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
31474      -            -L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
31475      -            -L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
     31469 +            -L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR"
31476 31470        fi
31477 31471      elif test "x$TOOLCHAIN_TYPE" = xgcc; then
31478 31472        SYSROOT_CFLAGS="--sysroot=$SYSROOT"
31479 31473        SYSROOT_LDFLAGS="--sysroot=$SYSROOT"
31480 31474      elif test "x$TOOLCHAIN_TYPE" = xclang; then
31481 31475        SYSROOT_CFLAGS="-isysroot $SYSROOT"
31482 31476        SYSROOT_LDFLAGS="-isysroot $SYSROOT"
31483 31477      fi
31484 31478      # Propagate the sysroot args to hotspot
31485 31479      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
↓ open down ↓ 1495 lines elided ↑ open up ↑
32981 32975        # For Xcode, we set the Xcode version as TOOLCHAIN_VERSION
32982 32976        TOOLCHAIN_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | $CUT -f 2 -d ' '`
32983 32977        TOOLCHAIN_DESCRIPTION="$TOOLCHAIN_DESCRIPTION from Xcode"
32984 32978      else
32985 32979        # Currently we do not define this for other toolchains. This might change as the need arise.
32986 32980        TOOLCHAIN_VERSION=
32987 32981      fi
32988 32982    fi
32989 32983  
32990 32984  
32991      -  # For solaris we really need solaris tools, and not the GNU equivalent.
32992      -  # The build tools on Solaris reside in /usr/ccs (C Compilation System),
32993      -  # so add that to path before starting to probe.
32994      -  # FIXME: This was originally only done for AS,NM,GNM,STRIP,OBJCOPY,OBJDUMP.
32995      -  if test "x$OPENJDK_BUILD_OS" = xsolaris; then
32996      -    PATH="/usr/ccs/bin:$PATH"
32997      -  fi
32998      -
32999 32985    # Finally add TOOLCHAIN_PATH at the beginning, to allow --with-tools-dir to
33000 32986    # override all other locations.
33001 32987    if test "x$TOOLCHAIN_PATH" != x; then
33002 32988      PATH=$TOOLCHAIN_PATH:$PATH
33003 32989    fi
33004 32990  
33005 32991  
33006 32992    #
33007 32993    # Setup the compilers (CC and CXX)
33008 32994    #
↓ open down ↓ 10980 lines elided ↑ open up ↑
43989 43975  
43990 43976    if test "x$BUILD_SYSROOT" != "x"; then
43991 43977      if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
43992 43978        if test "x$OPENJDK_TARGET_OS" = xsolaris; then
43993 43979          # Solaris Studio does not have a concept of sysroot. Instead we must
43994 43980          # make sure the default include and lib dirs are appended to each
43995 43981          # compile and link command line. Must also add -I-xbuiltin to enable
43996 43982          # inlining of system functions and intrinsics.
43997 43983          BUILD_SYSROOT_CFLAGS="-I-xbuiltin -I$BUILD_SYSROOT/usr/include"
43998 43984          BUILD_SYSROOT_LDFLAGS="-L$BUILD_SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
43999      -            -L$BUILD_SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
44000      -            -L$BUILD_SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
     43985 +            -L$BUILD_SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR"
44001 43986        fi
44002 43987      elif test "x$TOOLCHAIN_TYPE" = xgcc; then
44003 43988        BUILD_SYSROOT_CFLAGS="--sysroot=$BUILD_SYSROOT"
44004 43989        BUILD_SYSROOT_LDFLAGS="--sysroot=$BUILD_SYSROOT"
44005 43990      elif test "x$TOOLCHAIN_TYPE" = xclang; then
44006 43991        BUILD_SYSROOT_CFLAGS="-isysroot $BUILD_SYSROOT"
44007 43992        BUILD_SYSROOT_LDFLAGS="-isysroot $BUILD_SYSROOT"
44008 43993      fi
44009 43994      # Propagate the sysroot args to hotspot
44010 43995      BUILD_LEGACY_EXTRA_CFLAGS="$BUILD_LEGACY_EXTRA_CFLAGS $BUILD_SYSROOT_CFLAGS"
↓ open down ↓ 12708 lines elided ↑ open up ↑
56719 56704        HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
56720 56705      fi
56721 56706    fi
56722 56707  
56723 56708        as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
56724 56709      fi
56725 56710  
56726 56711      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
56727 56712        OPENWIN_HOME="/usr/openwin"
56728 56713        X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
56729      -      X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
56730      -          -L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
56731      -          -R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
     56714 +      X_LIBS="-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
56732 56715            -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
56733 56716      fi
56734 56717  
56735 56718      ac_ext=c
56736 56719  ac_cpp='$CPP $CPPFLAGS'
56737 56720  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
56738 56721  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
56739 56722  ac_compiler_gnu=$ac_cv_c_compiler_gnu
56740 56723  
56741 56724      OLD_CFLAGS="$CFLAGS"
↓ open down ↓ 4413 lines elided ↑ open up ↑
61155 61138      FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
61156 61139      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
61157 61140  $as_echo_n "checking for freetype libraries... " >&6; }
61158 61141      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
61159 61142  $as_echo "$FREETYPE_LIB_PATH" >&6; }
61160 61143    fi
61161 61144  
61162 61145              fi
61163 61146            fi
61164 61147  
61165      -          if test "x$FOUND_FREETYPE" != xyes; then
61166      -            FREETYPE_BASE_DIR="$SYSROOT/usr/sfw"
61167      -
61168      -  POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
61169      -  POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
61170      -  METHOD="well-known location"
61171      -
61172      -  # Let's start with an optimistic view of the world :-)
61173      -  FOUND_FREETYPE=yes
61174      -
61175      -  # First look for the canonical freetype main include file ft2build.h.
61176      -  if ! test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
61177      -    # Oh no! Let's try in the freetype2 directory. This is needed at least at Mac OS X Yosemite.
61178      -    POTENTIAL_FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH/freetype2"
61179      -    if ! test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
61180      -      # Fail.
61181      -      FOUND_FREETYPE=no
61182      -    fi
61183      -  fi
61184      -
61185      -  if test "x$FOUND_FREETYPE" = xyes; then
61186      -    # Include file found, let's continue the sanity check.
61187      -    { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
61188      -$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
61189      -
61190      -    # Reset to default value
61191      -    FREETYPE_BASE_NAME=freetype
61192      -    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}${FREETYPE_BASE_NAME}${SHARED_LIBRARY_SUFFIX}"
61193      -    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
61194      -      if test "x$OPENJDK_TARGET_OS" = xmacosx \
61195      -          && test -s "$POTENTIAL_FREETYPE_LIB_PATH/${LIBRARY_PREFIX}freetype.6${SHARED_LIBRARY_SUFFIX}"; then
61196      -        # On Mac OS X Yosemite, the symlink from libfreetype.dylib to libfreetype.6.dylib disappeared. Check
61197      -        # for the .6 version explicitly.
61198      -        FREETYPE_BASE_NAME=freetype.6
61199      -        FREETYPE_LIB_NAME="${LIBRARY_PREFIX}${FREETYPE_BASE_NAME}${SHARED_LIBRARY_SUFFIX}"
61200      -        { $as_echo "$as_me:${as_lineno-$LINENO}: Compensating for missing symlink by using version 6 explicitly" >&5
61201      -$as_echo "$as_me: Compensating for missing symlink by using version 6 explicitly" >&6;}
61202      -      else
61203      -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
61204      -$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
61205      -        FOUND_FREETYPE=no
61206      -      fi
61207      -    else
61208      -      if test "x$OPENJDK_TARGET_OS" = xwindows; then
61209      -        # On Windows, we will need both .lib and .dll file.
61210      -        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/${FREETYPE_BASE_NAME}.lib"; then
61211      -          { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/${FREETYPE_BASE_NAME}.lib. Ignoring location." >&5
61212      -$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/${FREETYPE_BASE_NAME}.lib. Ignoring location." >&6;}
61213      -          FOUND_FREETYPE=no
61214      -        fi
61215      -      elif test "x$OPENJDK_TARGET_OS" = xsolaris \
61216      -          && test -s "$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR/$FREETYPE_LIB_NAME"; then
61217      -        # Found lib in isa dir, use that instead.
61218      -        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR"
61219      -        { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting to use $POTENTIAL_FREETYPE_LIB_PATH instead" >&5
61220      -$as_echo "$as_me: Rewriting to use $POTENTIAL_FREETYPE_LIB_PATH instead" >&6;}
61221      -      fi
61222      -    fi
61223      -  fi
61224      -
61225      -  if test "x$FOUND_FREETYPE" = xyes; then
61226      -
61227      -  # Only process if variable expands to non-empty
61228      -
61229      -  if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x; then
61230      -    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
61231      -
61232      -  # Input might be given as Windows format, start by converting to
61233      -  # unix format.
61234      -  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
61235      -  new_path=`$CYGPATH -u "$path"`
61236      -
61237      -  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
61238      -  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
61239      -  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
61240      -  # "foo.exe" is OK but "foo" is an error.
61241      -  #
61242      -  # This test is therefore slightly more accurate than "test -f" to check for file precense.
61243      -  # It is also a way to make sure we got the proper file name for the real test later on.
61244      -  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
61245      -  if test "x$test_shortpath" = x; then
61246      -    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
61247      -$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
61248      -    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
61249      -  fi
61250      -
61251      -  # Call helper function which possibly converts this using DOS-style short mode.
61252      -  # If so, the updated path is stored in $new_path.
61253      -
61254      -  input_path="$new_path"
61255      -  # Check if we need to convert this using DOS-style short mode. If the path
61256      -  # contains just simple characters, use it. Otherwise (spaces, weird characters),
61257      -  # take no chances and rewrite it.
61258      -  # Note: m4 eats our [], so we need to use [ and ] instead.
61259      -  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
61260      -  if test "x$has_forbidden_chars" != x; then
61261      -    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
61262      -    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
61263      -    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
61264      -    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
61265      -      # Going to short mode and back again did indeed matter. Since short mode is
61266      -      # case insensitive, let's make it lowercase to improve readability.
61267      -      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
61268      -      # Now convert it back to Unix-style (cygpath)
61269      -      input_path=`$CYGPATH -u "$shortmode_path"`
61270      -      new_path="$input_path"
61271      -    fi
61272      -  fi
61273      -
61274      -  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
61275      -  if test "x$test_cygdrive_prefix" = x; then
61276      -    # As a simple fix, exclude /usr/bin since it's not a real path.
61277      -    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
61278      -      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
61279      -      # a path prefixed by /cygdrive for fixpath to work.
61280      -      new_path="$CYGWIN_ROOT_PATH$input_path"
61281      -    fi
61282      -  fi
61283      -
61284      -
61285      -  if test "x$path" != "x$new_path"; then
61286      -    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
61287      -    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
61288      -$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
61289      -  fi
61290      -
61291      -    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
61292      -
61293      -  path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
61294      -  has_colon=`$ECHO $path | $GREP ^.:`
61295      -  new_path="$path"
61296      -  if test "x$has_colon" = x; then
61297      -    # Not in mixed or Windows style, start by that.
61298      -    new_path=`cmd //c echo $path`
61299      -  fi
61300      -
61301      -
61302      -  input_path="$new_path"
61303      -  # Check if we need to convert this using DOS-style short mode. If the path
61304      -  # contains just simple characters, use it. Otherwise (spaces, weird characters),
61305      -  # take no chances and rewrite it.
61306      -  # Note: m4 eats our [], so we need to use [ and ] instead.
61307      -  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
61308      -  if test "x$has_forbidden_chars" != x; then
61309      -    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
61310      -    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
61311      -  fi
61312      -
61313      -
61314      -  windows_path="$new_path"
61315      -  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
61316      -    unix_path=`$CYGPATH -u "$windows_path"`
61317      -    new_path="$unix_path"
61318      -  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
61319      -    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
61320      -    new_path="$unix_path"
61321      -  fi
61322      -
61323      -  if test "x$path" != "x$new_path"; then
61324      -    POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
61325      -    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
61326      -$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
61327      -  fi
61328      -
61329      -  # Save the first 10 bytes of this path to the storage, so fixpath can work.
61330      -  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
61331      -
61332      -    else
61333      -      # We're on a unix platform. Hooray! :)
61334      -      path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
61335      -      has_space=`$ECHO "$path" | $GREP " "`
61336      -      if test "x$has_space" != x; then
61337      -        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
61338      -$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
61339      -        as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
61340      -      fi
61341      -
61342      -      # Use eval to expand a potential ~
61343      -      eval path="$path"
61344      -      if test ! -f "$path" && test ! -d "$path"; then
61345      -        as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
61346      -      fi
61347      -
61348      -      if test -d "$path"; then
61349      -        POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
61350      -      else
61351      -        dir="`$DIRNAME "$path"`"
61352      -        base="`$BASENAME "$path"`"
61353      -        POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
61354      -      fi
61355      -    fi
61356      -  fi
61357      -
61358      -
61359      -  # Only process if variable expands to non-empty
61360      -
61361      -  if test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
61362      -    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
61363      -
61364      -  # Input might be given as Windows format, start by converting to
61365      -  # unix format.
61366      -  path="$POTENTIAL_FREETYPE_LIB_PATH"
61367      -  new_path=`$CYGPATH -u "$path"`
61368      -
61369      -  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
61370      -  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
61371      -  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
61372      -  # "foo.exe" is OK but "foo" is an error.
61373      -  #
61374      -  # This test is therefore slightly more accurate than "test -f" to check for file precense.
61375      -  # It is also a way to make sure we got the proper file name for the real test later on.
61376      -  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
61377      -  if test "x$test_shortpath" = x; then
61378      -    { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
61379      -$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
61380      -    as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
61381      -  fi
61382      -
61383      -  # Call helper function which possibly converts this using DOS-style short mode.
61384      -  # If so, the updated path is stored in $new_path.
61385      -
61386      -  input_path="$new_path"
61387      -  # Check if we need to convert this using DOS-style short mode. If the path
61388      -  # contains just simple characters, use it. Otherwise (spaces, weird characters),
61389      -  # take no chances and rewrite it.
61390      -  # Note: m4 eats our [], so we need to use [ and ] instead.
61391      -  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
61392      -  if test "x$has_forbidden_chars" != x; then
61393      -    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
61394      -    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
61395      -    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
61396      -    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
61397      -      # Going to short mode and back again did indeed matter. Since short mode is
61398      -      # case insensitive, let's make it lowercase to improve readability.
61399      -      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
61400      -      # Now convert it back to Unix-style (cygpath)
61401      -      input_path=`$CYGPATH -u "$shortmode_path"`
61402      -      new_path="$input_path"
61403      -    fi
61404      -  fi
61405      -
61406      -  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
61407      -  if test "x$test_cygdrive_prefix" = x; then
61408      -    # As a simple fix, exclude /usr/bin since it's not a real path.
61409      -    if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
61410      -      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
61411      -      # a path prefixed by /cygdrive for fixpath to work.
61412      -      new_path="$CYGWIN_ROOT_PATH$input_path"
61413      -    fi
61414      -  fi
61415      -
61416      -
61417      -  if test "x$path" != "x$new_path"; then
61418      -    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
61419      -    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
61420      -$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
61421      -  fi
61422      -
61423      -    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
61424      -
61425      -  path="$POTENTIAL_FREETYPE_LIB_PATH"
61426      -  has_colon=`$ECHO $path | $GREP ^.:`
61427      -  new_path="$path"
61428      -  if test "x$has_colon" = x; then
61429      -    # Not in mixed or Windows style, start by that.
61430      -    new_path=`cmd //c echo $path`
61431      -  fi
61432      -
61433      -
61434      -  input_path="$new_path"
61435      -  # Check if we need to convert this using DOS-style short mode. If the path
61436      -  # contains just simple characters, use it. Otherwise (spaces, weird characters),
61437      -  # take no chances and rewrite it.
61438      -  # Note: m4 eats our [], so we need to use [ and ] instead.
61439      -  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
61440      -  if test "x$has_forbidden_chars" != x; then
61441      -    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
61442      -    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
61443      -  fi
61444      -
61445      -
61446      -  windows_path="$new_path"
61447      -  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
61448      -    unix_path=`$CYGPATH -u "$windows_path"`
61449      -    new_path="$unix_path"
61450      -  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
61451      -    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
61452      -    new_path="$unix_path"
61453      -  fi
61454      -
61455      -  if test "x$path" != "x$new_path"; then
61456      -    POTENTIAL_FREETYPE_LIB_PATH="$new_path"
61457      -    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
61458      -$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
61459      -  fi
61460      -
61461      -  # Save the first 10 bytes of this path to the storage, so fixpath can work.
61462      -  all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
61463      -
61464      -    else
61465      -      # We're on a unix platform. Hooray! :)
61466      -      path="$POTENTIAL_FREETYPE_LIB_PATH"
61467      -      has_space=`$ECHO "$path" | $GREP " "`
61468      -      if test "x$has_space" != x; then
61469      -        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
61470      -$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
61471      -        as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
61472      -      fi
61473      -
61474      -      # Use eval to expand a potential ~
61475      -      eval path="$path"
61476      -      if test ! -f "$path" && test ! -d "$path"; then
61477      -        as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
61478      -      fi
61479      -
61480      -      if test -d "$path"; then
61481      -        POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
61482      -      else
61483      -        dir="`$DIRNAME "$path"`"
61484      -        base="`$BASENAME "$path"`"
61485      -        POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
61486      -      fi
61487      -    fi
61488      -  fi
61489      -
61490      -
61491      -    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
61492      -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
61493      -$as_echo_n "checking for freetype includes... " >&6; }
61494      -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
61495      -$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
61496      -    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
61497      -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
61498      -$as_echo_n "checking for freetype libraries... " >&6; }
61499      -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
61500      -$as_echo "$FREETYPE_LIB_PATH" >&6; }
61501      -  fi
61502      -
61503      -          fi
61504      -
61505 61148            if test "x$FOUND_FREETYPE" != xyes; then
61506 61149              FREETYPE_BASE_DIR="$SYSROOT/usr"
61507 61150              if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
61508 61151  
61509 61152    POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
61510 61153    POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu"
61511 61154    METHOD="well-known location"
61512 61155  
61513 61156    # Let's start with an optimistic view of the world :-)
61514 61157    FOUND_FREETYPE=yes
↓ open down ↓ 5893 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX