Add ABI-specific directories to the system library path
This commit is contained in:
parent
595a94512f
commit
0ef86260c7
20
libisoburn-1.5.4-rpath.patch
Normal file
20
libisoburn-1.5.4-rpath.patch
Normal file
@ -0,0 +1,20 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for libisoburn >= 1.5.4 to work around the Debian
|
||||
specific aclocal/libtool behaviour not covering /usr/lib64 or /lib64 paths for 64 bit libraries.
|
||||
|
||||
--- libisoburn-1.5.4/configure 2021-01-30 15:32:57.000000000 +0100
|
||||
+++ libisoburn-1.5.4/configure.rpath 2021-07-23 03:13:01.956656342 +0200
|
||||
@@ -11541,10 +11541,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
|
@ -11,6 +11,7 @@ Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{versi
|
||||
Source2: gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg
|
||||
Source3: xorriso_extract_iso_image.desktop
|
||||
Patch0: libisoburn-1.0.8-multilib.patch
|
||||
Patch1: libisoburn-1.5.4-rpath.patch
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: gcc, gcc-c++, make, readline-devel, libacl-devel, zlib-devel
|
||||
%if 0%{?rhel} == 7
|
||||
@ -89,6 +90,7 @@ DVD-RAM, BD-R and BD-RE.
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%setup -q -n %{pkgname}-%{version}
|
||||
%patch0 -p1 -b .multilib
|
||||
%patch1 -p1 -b .rpath
|
||||
|
||||
# Use libisofs1 and libburn1 on EPEL
|
||||
%if 0%{?rhel} == 7 || (0%{?rhel} && "%{name}" != "%{pkgname}")
|
||||
|
Loading…
Reference in New Issue
Block a user