5146bed53d
- Update release notes for 8u482-b08. - Remove generated-configure.sh changes from JDK-8141590 & FIPS patch as we already autogenerate this - Turn on system FreeType as on later JDK versions and add to _privatelibs - Set bundled FreeType version to 2.13.2 following JDK-8316028 - Bump LCMS 2 version to 2.14.0 following JDK-8297088 - Bump libpng version to 1.6.51 following JDK-8372534 Resolves: RHEL-142689 Resolves: RHEL-139521 Resolves: RHEL-131446 Resolves: RHEL-131459 ** This tarball is embargoed until 2026-01-20 @ 1pm PT. **
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
commit 928f3bf4a3017931ecc7012688e62d8a03264e61
|
|
Author: Andrew Hughes <gnu.andrew@redhat.com>
|
|
AuthorDate: Thu Jan 16 17:40:36 2025 +0000
|
|
Commit: Andrew Hughes <gnu.andrew@redhat.com>
|
|
CommitDate: Thu Jan 16 22:50:24 2025 +0000
|
|
|
|
Search /usr/lib64 on architectures other than x86_64
|
|
|
|
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
|
|
index 4ed8b4fdd6..6ab6dbc075 100644
|
|
--- a/common/autoconf/libraries.m4
|
|
+++ b/common/autoconf/libraries.m4
|
|
@@ -1121,9 +1121,11 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
|
|
AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
|
|
fi
|
|
else
|
|
- # Fallback on the default /usr/lib dir
|
|
+ # Fallback on the default /usr/lib and /usr/lib64 dirs
|
|
if test -e ${SYSROOT}/usr/lib/libffi.so.? ; then
|
|
LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/libffi.so.?"
|
|
+ elif test -e ${SYSROOT}/usr/lib64/libffi.so.? ; then
|
|
+ LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/libffi.so.?"
|
|
else
|
|
AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
|
|
fi
|