rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

on arm chrpath outputs RUNPATH= instead of RPATH=

Browse Source 
%ghc_fix_dynamic_rpath now handles both program names and absolute paths
This commit is contained in:
Jens Petersen 2015-01-31 09:40:55 +00:00
parent 856d8134b6
commit 07399a8849
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.4.3 Version: 1.4.4
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
@ -88,6 +88,9 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
%changelog %changelog
* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.4-1
- ghc_fix_dynamic_rpath: on ARMv7 RPATH is RUNPATH
* Thu Jan 22 2015 Jens Petersen <petersen@redhat.com> - 1.4.3-1 * Thu Jan 22 2015 Jens Petersen <petersen@redhat.com> - 1.4.3-1
- version ghcpkgdocdir - version ghcpkgdocdir
- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir - add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir

7
macros.ghc
View File

@ -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\ if ! type chrpath > /dev/null; then exit 1; fi\
PDIR=$(pwd)\ PDIR=$(pwd)\
for i in %*; do\ for i in %*; do\
PROG=%{buildroot}%{_bindir}/$i\ case $i in\
/*) PROG=%{buildroot}$i ;;\
*) PROG=%{buildroot}%{_bindir}/$i ;;\
esac\
if [ -x "$PROG" ]; then\ 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\ case $RPATH in\
*$PDIR*)\ *$PDIR*)\
NEWRPATH=$(echo $RPATH | sed -e "s@$PDIR/dist/build@%{ghclibdir}/%{pkg_name}-%{version}@g")\ NEWRPATH=$(echo $RPATH | sed -e "s@$PDIR/dist/build@%{ghclibdir}/%{pkg_name}-%{version}@g")\