RFR: JDK-8042213: Freetype detection fails on Solaris sparcv9 when using devkit

Tim Bell tim.bell at oracle.com
Wed Apr 30 12:41:21 UTC 2014


Hello Erik:

> Please review this small fix to freetype detection in configure. On 
> Solaris, libs are typically found in the "isadir" for 64bit builds. 
> This was only handled for amd64 for freetype. This patch makes it more 
> universal.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8042213
> Patch inline:

Looks good to me.

Tim

> diff -r de3a6b2a6904 common/autoconf/libraries.m4
> --- a/common/autoconf/libraries.m4
> +++ b/common/autoconf/libraries.m4
> @@ -286,9 +286,10 @@
>            AC_MSG_NOTICE([Could not find 
> $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location.])
>            FOUND_FREETYPE=no
>          fi
> -      elif test "x$OPENJDK_TARGET_OS" = xsolaris && test 
> "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s 
> "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
> -        # On solaris-x86_86, default is (normally) PATH/lib/amd64. 
> Update our guess!
> - POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
> +      elif test "x$OPENJDK_TARGET_OS" = xsolaris \
> +          && test -s 
> "$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR/$FREETYPE_LIB_NAME"; 
> then
> +        # Found lib in isa dir, use that instead.
> + 
> POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR"
>        fi
>      fi
>    fi
>
> /Erik




More information about the build-dev mailing list