only configure with --global if not subpackaging libs
This commit is contained in:
parent
e08038a4a4
commit
f0c10c9f13
@ -92,7 +92,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
|
||||
# ghc_lib_build_without_haddock [name] [version]
|
||||
%ghc_lib_build_without_haddock()\
|
||||
%global debug_package %{nil}\
|
||||
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} --global %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
|
||||
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
|
||||
%cabal build\
|
||||
%{nil}
|
||||
|
||||
|
@ -6,8 +6,8 @@
|
||||
#%%global without_hscolour 1
|
||||
|
||||
Name: ghc-rpm-macros
|
||||
Version: 1.0
|
||||
Release: 3%{?dist}
|
||||
Version: 1.0.1
|
||||
Release: 1%{?dist}
|
||||
Summary: RPM macros for building packages for GHC
|
||||
|
||||
License: GPLv3
|
||||
@ -87,6 +87,9 @@ EOF
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 20 2013 Jens Petersen <petersen@redhat.com> - 1.0.1-1
|
||||
- only configure with --global if not subpackaging libs
|
||||
|
||||
* Thu Jun 20 2013 Jens Petersen <petersen@redhat.com> - 1.0-3
|
||||
- reenable hscolour
|
||||
|
||||
@ -107,6 +110,7 @@ EOF
|
||||
|
||||
* Fri May 17 2013 Jens Petersen <petersen@redhat.com> - 0.99.1-1
|
||||
- drop new ghc_compiler macro since it is not good for koji
|
||||
- ghc_fix_dynamic_rpath: do not assume first RPATH
|
||||
|
||||
* Tue Apr 23 2013 Jens Petersen <petersen@redhat.com> - 0.99-1
|
||||
- update for simplified revised Haskell Packaging Guidelines
|
||||
|
Loading…
Reference in New Issue
Block a user