[ghc-rpm-macros] on arm chrpath outputs RUNPATH= instead of RPATH=
Jens Petersen
petersen at fedoraproject.org
Sat Jan 31 09:45:02 UTC 2015
commit 07399a88491d0ff92b39527451b9553973d9c867
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Jan 31 09:40:55 2015 +0000
on arm chrpath outputs RUNPATH= instead of RPATH=
%ghc_fix_dynamic_rpath now handles both program names and absolute paths
ghc-rpm-macros.spec | 5 ++++-
macros.ghc | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 2ce1e68..0942bb9 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
-Version: 1.4.3
+Version: 1.4.4
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
@@ -88,6 +88,9 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
%changelog
+* Sat Jan 31 2015 Jens Petersen <petersen at redhat.com> - 1.4.4-1
+- ghc_fix_dynamic_rpath: on ARMv7 RPATH is RUNPATH
+
* Thu Jan 22 2015 Jens Petersen <petersen at redhat.com> - 1.4.3-1
- version ghcpkgdocdir
- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir
diff --git a/macros.ghc b/macros.ghc
index 4e3ecf3..0b4b85f 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -136,9 +136,12 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
if ! type chrpath > /dev/null; then exit 1; fi\
PDIR=$(pwd)\
for i in %*; do\
- PROG=%{buildroot}%{_bindir}/$i\
+ case $i in\
+ /*) PROG=%{buildroot}$i ;;\
+ *) PROG=%{buildroot}%{_bindir}/$i ;;\
+ esac\
if [ -x "$PROG" ]; then\
- RPATH=$(chrpath $PROG | sed -e "s@^$PROG: RPATH=@@")\
+ RPATH=$(chrpath $PROG | sed -e "s@^$PROG: RU\?N\?PATH=@@")\
case $RPATH in\
*$PDIR*)\
NEWRPATH=$(echo $RPATH | sed -e "s@$PDIR/dist/build@%{ghclibdir}/%{pkg_name}-%{version}@g")\
More information about the scm-commits
mailing list