From c10f7853947ed2b72bde46faccde9f2212643c40 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 3 Jan 2024 10:10:28 -0700 Subject: [PATCH] Remove need for chrpath --- liblouis.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/liblouis.spec b/liblouis.spec index 6255a05..4e23137 100644 --- a/liblouis.spec +++ b/liblouis.spec @@ -13,7 +13,6 @@ License: LGPL-2.1-or-later AND LGPL-2.0-or-later URL: http://liblouis.org Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc BuildRequires: help2man @@ -123,6 +122,14 @@ cd python %build %configure --disable-static --enable-ucs4 + +# Get rid of undesirable hardcoded rpaths; workaround libtool reordering +# -Wl,--as-needed after all the libraries. +sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' \ + -i libtool + # parallel builds fail make cd doc; xetex %{name}.texi @@ -131,7 +138,7 @@ cd ../python %check -make check +LD_LIBRARY_PATH=%{buildroot}%{_libdir} make check %install @@ -152,12 +159,6 @@ cd python %pyproject_save_files louis cd - -# Remove Rpaths from the executables. We must do that in the %%install section -# because, otherwise, the test suite wouldn't build. -for f in %{buildroot}%{_bindir}/lou_* ; do - chrpath --delete $f -done - %ldconfig_scriptlets @@ -196,6 +197,7 @@ done - Build the python package with dist-info - Add tables subpackage for the noarch data - Complete and correct SPDX migration +- Remove need for chrpath * Thu Jul 20 2023 Fedora Release Engineering - 3.25.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild