change ghc_bootstrap to a macro that disables shared and prof libs, docs, and testsuite
- ghc_bootstrap is now a macro which sets ghc_bootstrapping, ghc_without_shared, without_prof, without_haddock, without_hscolour, without_manual, without_testsuite - tweaks to ghc_check_bootstrap
This commit is contained in:
parent
ed9a00f761
commit
e6a0b6cbfe
@ -8,11 +8,11 @@
|
|||||||
# check ghc version was rebuilt against self
|
# check ghc version was rebuilt against self
|
||||||
%ghc_check_bootstrap\
|
%ghc_check_bootstrap\
|
||||||
if [ ! "$(ghc --info | grep \\"Booter\\ version\\",\\"%{ghc_version}\\")" ]; then\
|
if [ ! "$(ghc --info | grep \\"Booter\\ version\\",\\"%{ghc_version}\\")" ]; then\
|
||||||
echo "Warning: this ghc build is not self-bootstrapped.\
|
echo "Warning: this ghc build is not self-bootstrapped."\
|
||||||
The ghc package should be rebuilt against its current version first\
|
%if %{undefined ghc_bootstrapping}\
|
||||||
to prevent dependency ABI breakage from a future ghc rebuild.\
|
echo "The ghc package should be rebuilt against its current version before\
|
||||||
(This can be overridden understanding this risk, by defining ghc_bootstrap.)"\
|
proceeding, to avoid dependency ABI breakage from a future ghc rebuild."\
|
||||||
%if %{undefined ghc_bootstrap}\
|
echo "To override set ghc_bootstrapping.
|
||||||
echo "Aborting."\
|
echo "Aborting."\
|
||||||
exit 1\
|
exit 1\
|
||||||
%endif\
|
%endif\
|
||||||
@ -213,3 +213,13 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
|
|||||||
%ghc_gen_filelists\
|
%ghc_gen_filelists\
|
||||||
%{!?1:%ghc_strip_dynlinked}\
|
%{!?1:%ghc_strip_dynlinked}\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
|
# skip shared and prof libs, documentation, and testsuite
|
||||||
|
%ghc_bootstrap\
|
||||||
|
%global ghc_bootstrapping 1\
|
||||||
|
%global ghc_without_shared 1\
|
||||||
|
%global without_prof 1\
|
||||||
|
%global without_haddock 1\
|
||||||
|
%global without_hscolour 1\
|
||||||
|
%global without_manual 1\
|
||||||
|
%global without_testsuite 1
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
%global macros_file %{_sysconfdir}/rpm/macros.ghc
|
%global macros_file %{_sysconfdir}/rpm/macros.ghc
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 0.13.4
|
Version: 0.13.5
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Macros for building packages for GHC
|
Summary: Macros for building packages for GHC
|
||||||
|
|
||||||
@ -24,6 +24,7 @@ A set of macros for building GHC packages following the Haskell Guidelines
|
|||||||
of the Fedora Haskell SIG. ghc needs to be installed in order to make use of
|
of the Fedora Haskell SIG. ghc needs to be installed in order to make use of
|
||||||
these macros.
|
these macros.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -c -T
|
%setup -c -T
|
||||||
cp %{SOURCE1} %{SOURCE2} .
|
cp %{SOURCE1} %{SOURCE2} .
|
||||||
@ -58,6 +59,12 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.5-1
|
||||||
|
- ghc_bootstrap is now a macro which sets ghc_bootstrapping,
|
||||||
|
ghc_without_shared, without_prof, without_haddock, without_hscolour,
|
||||||
|
without_manual, without_testsuite
|
||||||
|
- tweaks to ghc_check_bootstrap
|
||||||
|
|
||||||
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.4-1
|
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.4-1
|
||||||
- add ghc_check_bootstrap
|
- add ghc_check_bootstrap
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user