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

fix %ghc_fix_rpath for ghc-7.10

Browse Source
This commit is contained in:
Jens Petersen 2017-04-07 19:09:23 +09:00
parent 7855aaa8f1
commit 38f99a79b3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-rpm-macros.spec
View File

@ -36,6 +36,8 @@ Requires: ghc-compiler
Requires: hscolour Requires: hscolour
%endif %endif
%endif %endif
# this package could now be noarch again
#BuildArch: noarch
%description %description
A set of macros for building GHC packages following the Haskell Guidelines A set of macros for building GHC packages following the Haskell Guidelines

8
macros.ghc
View File

@ -172,8 +172,14 @@ for lib in %*; do\
rpath=$(chrpath $i | sed -e "s@^$i: R.*PATH=@@")\ rpath=$(chrpath $i | sed -e "s@^$i: R.*PATH=@@")\
case $rpath in\ case $rpath in\
*$PWD/$lib/dist/build*)\ *$PWD/$lib/dist/build*)\
case %{ghc_version} in\
7.10.*)\
pkgid=$(cd %{buildroot}%{ghclibdir}/package.conf.d; ls ${lib}* | sed -e "s/.conf$//")\
syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} --package-db=%{buildroot}%{ghclibdir}/package.conf.d field $pkgid library-dirs) ;;\
*)\
pkgid=$(cd %{buildroot}%{ghclibdir}; echo ${lib}*)\ pkgid=$(cd %{buildroot}%{ghclibdir}; echo ${lib}*)\
syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} --package-db=%{buildroot}%{ghclibdir}/package.conf.d field $lib library-dirs | grep $pkgid)\ syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} --package-db=%{buildroot}%{ghclibdir}/package.conf.d field $lib library-dirs | grep $pkgid) ;;\
esac\
newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g")\ newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g")\
chrpath -r $newrpath $i\ chrpath -r $newrpath $i\
;;\ ;;\