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

do not handle ghc libs location specially; ghc-pkg-wrapper rpath

Browse Source
This commit is contained in:
Jens Petersen 2018-01-23 12:49:58 +01:00
parent bc93aaa088
commit 5f6ff9c55c
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-pkg-wrapper
View File

@ -22,7 +22,7 @@ if [ -x "$INPLACE_GHCPKG" ]; then
;; ;;
# 7.8 and 7.10 # 7.8 and 7.10
*) *)
GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR" GHC_PKG="env LD_LIBRARY_PATH=$(dirname $PKGBASEDIR) $PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
;; ;;
esac esac
else else

2
ghc-rpm-macros.spec
View File

@ -164,7 +164,7 @@ EOF
%changelog %changelog
* 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 except ghc's libs - dynlibs in _libdir
- drop ghc_without_shared - drop ghc_without_shared
- ghc_fix_rpath removes RPATHs for 8.2+ - ghc_fix_rpath removes RPATHs for 8.2+

7
macros.ghc
View File

@ -91,15 +91,8 @@ rm -f %{basepkg}.files %{basepkg}-devel.files\
touch %{basepkg}.files %{basepkg}-devel.files\ touch %{basepkg}.files %{basepkg}-devel.files\
echo ${pkgconf} >> %{basepkg}-devel.files\ echo ${pkgconf} >> %{basepkg}-devel.files\
if [ -d "%{buildroot}${pkgdir}" ]; then\ if [ -d "%{buildroot}${pkgdir}" ]; then\
%if %{defined ghc_version_override}\
echo "%%dir ${pkgdir}" >> %{basepkg}.files\
echo "%%attr(755,root,root) ${pkgdir}/libHS*-ghc%{ghc_version}.so" >> %{basepkg}.files\
find %{buildroot}${pkgdir} -mindepth 1 -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
find %{buildroot}${pkgdir} ! \\( -type d -o -name "libHS*.so" \\) >> %{basepkg}-devel.files\
%else\
echo "%%attr(755,root,root) %{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so" >> %{basepkg}.files\ echo "%%attr(755,root,root) %{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so" >> %{basepkg}.files\
echo "${pkgdir}" >> %{basepkg}-devel.files\ echo "${pkgdir}" >> %{basepkg}-devel.files\
%endif\
fi\ fi\
if [ -d "%{buildroot}%{docdir}" ]; then\ if [ -d "%{buildroot}%{docdir}" ]; then\
echo "%{docdir}" >> %{basepkg}-devel.files\ echo "%{docdir}" >> %{basepkg}-devel.files\