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

ghc_bootstrap: add ghc_without_dynamic and drop without_hscolour

Browse Source
This commit is contained in:
Jens Petersen 2011-06-17 17:55:06 +09:00
parent 5d0da9c487
commit 4773ef18ac
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghc-rpm-macros.ghc
View File

@ -215,11 +215,12 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%{nil} %{nil}
# skip shared and prof libs, documentation, and testsuite # skip shared and prof libs, documentation, and testsuite
# - without_hscolour needs to be set locally in the spec file
%ghc_bootstrap\ %ghc_bootstrap\
%global ghc_bootstrapping 1\ %global ghc_bootstrapping 1\
%global ghc_without_shared 1\ %global ghc_without_shared 1\
%global ghc_without_dynamic 1\
%global without_prof 1\ %global without_prof 1\
%global without_haddock 1\ %global without_haddock 1\
%global without_hscolour 1\
%global without_manual 1\ %global without_manual 1\
%global without_testsuite 1 %global without_testsuite 1

6
ghc-rpm-macros.spec
View File

@ -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.5 Version: 0.13.6
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -59,6 +59,10 @@ EOF
%changelog %changelog
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.6-1
- also set ghc_without_dynamic for ghc_bootstrap
- drop without_hscolour from ghc_bootstrap: doesn't work for koji
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.5-1 * Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.5-1
- ghc_bootstrap is now a macro which sets ghc_bootstrapping, - ghc_bootstrap is now a macro which sets ghc_bootstrapping,
ghc_without_shared, without_prof, without_haddock, without_hscolour, ghc_without_shared, without_prof, without_haddock, without_hscolour,