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

%ghc_fix_rpath: remove leading or trailing ':'

Browse Source
This commit is contained in:
Jens Petersen 2018-01-23 15:24:11 +01:00
parent 1306c9a80d
commit bd0af716de
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

@ -10,7 +10,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.8.0 Version: 1.8.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -162,6 +162,9 @@ EOF
%changelog %changelog
* Tue Jan 23 2018 Jens Petersen <petersen@redhat.com> - 1.8.1-1
- ghc_fix_rpath: remove leading or trailing ':'
* Mon Jan 22 2018 Jens Petersen <petersen@redhat.com> - 1.8.0-1 * Mon Jan 22 2018 Jens Petersen <petersen@redhat.com> - 1.8.0-1
- add _ghcdynlibdir for Cabal --dynlibdir - add _ghcdynlibdir for Cabal --dynlibdir
- dynlibs in _libdir - dynlibs in _libdir

2
macros.ghc
View File

@ -194,7 +194,7 @@ for lib in %*; do\
*)\ *)\
syspath="" ;;\ syspath="" ;;\
esac\ esac\
newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g" -e "s/::/:/")\ newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g" -e "s/::/:/" -e "s/^://" -e "s/:$//")\
chrpath -r $newrpath $i\ chrpath -r $newrpath $i\
;;\ ;;\
esac\ esac\