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

use pkgid for libexecsubdir and libsubdir (#1563863)

Browse Source 
libexecsubdir is only available in Cabal 2
This commit is contained in:
Jens Petersen 2018-04-05 18:33:56 +09:00
parent cae5ea467c
commit 4887078b34
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-rpm-macros.spec
View File

@ -11,7 +11,7 @@
Name: ghc-rpm-macros
Version: 1.8.7
Release: 3%{?dist}
Release: 4%{?dist}
Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+
@ -165,6 +165,10 @@ EOF
%changelog
* Thu Apr 5 2018 Jens Petersen <petersen@redhat.com> - 1.8.7-4
- configure libexecsubdir (Cabal-2 only) (#1563863)
- change drop hash from libsubdir
* Tue Mar 6 2018 Jens Petersen <petersen@redhat.com> - 1.8.7-3
- obsolete ghc-ltk

2
macros.ghc
View File

@ -39,7 +39,7 @@ export CFLAGS\
%global _hardened_ldflags %{nil}\
LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\
%cabal --version\
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')}" %{?cabal_configure_options} $cabal_configure_extra_options
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')}" %{?cabal_configure_options} $cabal_configure_extra_options
# install
%cabal_install %cabal copy --destdir=%{buildroot} %{?cabal_install_options}