[PATCH] Freetype Directory Bug On zLinux

[Erik Joelsson]

Hello Adam,

Configure already looks in:

$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-linux-gnu

Which I would expect to cover your case, unless there is a mismatch 
between s390 and s390x here. Is your OPENJDK_TARGET_CPU set to s390 or 
s390x in this case? If this discrepancy between arch names cannot be 
resolved, then a special case like the one you propose is needed.

/Erik


On 2018-01-12 06:29, Adam Farley8 wrote:
> Hi All,
>
> On zLinux, freetype's .so file is typically installed in
> /usr/lib/s390x-linux-gnu, however the generated configure script doesn't
> look for it there.
>
> This causes configure to fail. I know you can avoid that with options, but
> I think a fix would be better.
>
> If we add this code to lib-freetype.m4 (line 365) and re-run autogen.sh,
> this fixes the problem.
>
> if test "x$FOUND_FREETYPE" != xyes; then
>     FREETYPE_BASE_DIR="$SYSROOT/usr"
>     if test "x$OPENJDK_TARGET_CPU_ARCH" = xs390; then
>        LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include],
> [$FREETYPE_BASE_DIR/lib/s390x-linux-gnu], [well-known location])
>     fi
> fi
>
> Thoughts?
>
> Best Regards
>
> Adam Farley
>
> Unless stated otherwise above:
> IBM United Kingdom Limited - Registered in England and Wales with number
> 741598.
> Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU