diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ab9c591..25e5491 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -191,7 +191,7 @@ EOF %changelog * Mon Jun 7 2021 Jens Petersen - 2.2.0-1 -- ghc_fix_rpaths macro deletes all RPATHs, replacing ghc_fix_rpath(), for +- ghc_delete_rpaths macro replaces ghc_fix_rpath(), needed for https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild * Wed Mar 24 2021 Jens Petersen - 2.1.0-1 diff --git a/macros.ghc b/macros.ghc index 8ecc585..1e52175 100644 --- a/macros.ghc +++ b/macros.ghc @@ -167,7 +167,7 @@ fi\ %{!?_fileattrsdir:%global _use_internal_dependency_generator 0}\ %{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\ %cabal_install\ -%ghc_fix_rpaths\ +%ghc_delete_rpaths\ %{nil} # ghc_lib_install [name] [version] @@ -178,19 +178,19 @@ fi\ %cabal_install\ %cabal_pkg_conf %{?1} %{?2}\ %ghc_gen_filelists %{?1} %{?2}\ -%ghc_fix_rpaths\ +%ghc_delete_rpaths\ %{nil} -# ghc_fix_rpaths -%ghc_fix_rpaths\ -%if %{undefined disable_ghc_fix_rpaths}\ -echo "running ghc_fix_rpaths:"\ +# ghc_delete_rpaths +%ghc_delete_rpaths\ +%if %{undefined disable_ghc_delete_rpaths}\ +echo "running ghc_delete_rpaths:"\ if ! type chrpath > /dev/null; then exit 1; fi\ for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\ if [ -x "$i" ]; then\ chrpath -d $i\ else\ - echo "%%ghc_fix_rpath: no $i executable"\ + echo "%%ghc_delete_rpath: no $i executable"\ exit 1\ fi\ done\