From 4dfb7d0f2a7d51d871bb565af67821d1030c3b62 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jul 23 2021 01:25:40 +0000
Subject: Add ABI-specific directories to the system library path


---

diff --git a/libisofs-1.5.4-rpath.patch b/libisofs-1.5.4-rpath.patch
new file mode 100644
index 0000000..6c62934
--- /dev/null
+++ b/libisofs-1.5.4-rpath.patch
@@ -0,0 +1,20 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for libisofs >= 1.5.4 to work around the Debian
+specific aclocal/libtool behaviour not covering /usr/lib64 or /lib64 paths for 64 bit libraries.
+
+--- libisofs-1.5.4/configure					2021-02-07 10:34:02.000000000 +0100
++++ libisofs-1.5.4/configure.rpath				2021-07-23 03:16:43.985026301 +0200
+@@ -11474,10 +11474,13 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Add ABI-specific directories to the system library path.
++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/libisofs.spec b/libisofs.spec
index 32cccb9..8c73021 100644
--- a/libisofs.spec
+++ b/libisofs.spec
@@ -11,6 +11,7 @@ Source0:        https://files.libburnia-project.org/releases/%{pkgname}-%{versio
 Source1:        https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig
 Source2:        gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg
 Patch0:         libisofs-0.6.16-multilib.patch
+Patch1:         libisofs-1.5.4-rpath.patch
 BuildRequires:  gnupg2
 BuildRequires:  gcc, make, libacl-devel, zlib-devel
 %if 0%{?rhel} && "%{name}" != "%{pkgname}"
@@ -50,6 +51,7 @@ documentation for developing applications that use %{name}.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .rpath
 
 # Rename from libisofs to libisofs1 for EPEL
 %if 0%{?rhel} && "%{name}" != "%{pkgname}"