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

fix fixing of rpaths

Browse Source
This commit is contained in:
Jens Petersen 2017-02-22 14:28:31 +09:00
parent 66fe267a12
commit 473b736053
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghc-rpm-macros.spec
View File

@ -149,6 +149,7 @@ EOF
%changelog %changelog
* Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.6.16-1 * Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.6.16-1
- fix generation of haddock's - fix generation of haddock's
- fix fixing of rpaths for subpackages
* Tue Feb 14 2017 Jens Petersen <petersen@redhat.com> - 1.6.15-2 * Tue Feb 14 2017 Jens Petersen <petersen@redhat.com> - 1.6.15-2
- do not set CFLAGS on ppc64 or ppc64le due to -Wunused-label noise - do not set CFLAGS on ppc64 or ppc64le due to -Wunused-label noise

7
macros.ghc
View File

@ -162,15 +162,14 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%ghc_fix_rpath()\ %ghc_fix_rpath()\
%if %{undefined ghc_without_dynamic}\ %if %{undefined ghc_without_dynamic}\
if ! type chrpath > /dev/null; then exit 1; fi\ if ! type chrpath > /dev/null; then exit 1; fi\
pdir=$(pwd)\
for lib in %*; do\
for i in $(find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\ for i in $(find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\
for lib in %*; do\
if [ -x "$i" ]; then\ if [ -x "$i" ]; then\
rpath=$(chrpath $i | sed -e "s@^$i: R.*PATH=@@")\ rpath=$(chrpath $i | sed -e "s@^$i: R.*PATH=@@")\
case $rpath in\ case $rpath in\
*$pdir/$lib/*)\ *$PWD/$lib/dist/build*)\
syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} --package-db=%{buildroot}%{ghclibdir}/package.conf.d field $lib library-dirs)\ syspath=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} --package-db=%{buildroot}%{ghclibdir}/package.conf.d field $lib library-dirs)\
NEWRPATH=$(echo $rpath | sed -e "s@$pdir/$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\
;;\ ;;\
esac\ esac\