On 01/12/2018 03:29 PM, Adam Farley8 wrote:
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.

Odd. Normally I would expect it to look in the locations that are
set through /etc/ld.so.conf{,.d}

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?

Seems like a workaround for an actual bug to me. Also, on Debian s390x,
the directory for shared libraries is also /usr/lib/s390x-linux-gnu:

glaubitz@zelenka:~$ ls -dl /usr/lib/s390x-linux-gnu
drwxr-xr-x 29 root root 28672 Dec 18 08:20 /usr/lib/s390x-linux-gnu
glaubitz@zelenka:~$

And I'm quite sure we don't have a quirk in the Debian openjdk package
in the form of a patch. So, I'm not sure why the configure doesn't work
in your case.

Adrian

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Reply via email to