File jdk8141590-bundle_libffi-followup.patch of Package java-1.8.0-openjdk-1.8.0.442.b06-2.el9

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/generated-configure.sh b/common/autoconf/generated-configure.sh
index 587b4c2657..5aeebe49a3 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4493,7 +4493,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1737049912
+DATE_WHEN_GENERATED=1737067804
 
 ###############################################################################
 #
@@ -50590,9 +50590,11 @@ $as_echo_n "checking for libffi lib file location... " >&6; }
             as_fn_error $? "Could not locate libffi.so.? for bundling" "$LINENO" 5
           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
             as_fn_error $? "Could not locate libffi.so.? for bundling" "$LINENO" 5
           fi
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