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

fix the R*PATH regexp

Browse Source
This commit is contained in:
Jens Petersen 2015-01-31 10:44:28 +00:00
parent 07399a8849
commit edf9be1b39
2 changed files with 5 additions and 2 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.4 Version: 1.4.5
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.5-1
- fix the R*PATH regexp
* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.4-1 * Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.4-1
- ghc_fix_dynamic_rpath: on ARMv7 RPATH is RUNPATH - ghc_fix_dynamic_rpath: on ARMv7 RPATH is RUNPATH

2
macros.ghc
View File

@ -141,7 +141,7 @@ for i in %*; do\
*) PROG=%{buildroot}%{_bindir}/$i ;;\ *) PROG=%{buildroot}%{_bindir}/$i ;;\
esac\ esac\
if [ -x "$PROG" ]; then\ if [ -x "$PROG" ]; then\
RPATH=$(chrpath $PROG | sed -e "s@^$PROG: RU\?N\?PATH=@@")\ RPATH=$(chrpath $PROG | sed -e "s@^$PROG: R.*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")\