rpms/ghc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

enable hscolour normally, drop BR hscolour, without_hscolour bootstrap now in ghc-rpm-macros

Browse Source
This commit is contained in:
Jens Petersen 2012-10-25 16:49:08 +09:00
parent f39feba3da
commit 356d662fcc
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghc.spec
View File

@ -1,16 +1,14 @@
# Shared haskell libraries are supported for x86* archs # Shared haskell libraries are supported for x86* archs
# (disabled for other archs in ghc-rpm-macros) # (disabled for other archs in ghc-rpm-macros)
# To bootstrap a new version of ghc, uncomment the following: # To bootstrap build a new version of ghc, uncomment the following:
%global ghc_bootstrapping 1 %global ghc_bootstrapping 1
%{?ghc_bootstrap} %{?ghc_bootstrap}
%global without_hscolour 1
%global without_testsuite 1 %global without_testsuite 1
# To do a test build instead with shared libs, uncomment the following: # To do a test build instead with shared libs, uncomment the following:
#%%global ghc_bootstrapping 1 #%%global ghc_bootstrapping 1
#%%{?ghc_test} #%%{?ghc_test}
#%%global without_hscolour 1
#%%global without_testsuite 1 #%%global without_testsuite 1
# unregisterized archs # unregisterized archs
@ -68,9 +66,6 @@ BuildRequires: ncurses-devel
%if %{undefined without_manual} %if %{undefined without_manual}
BuildRequires: libxslt, docbook-style-xsl BuildRequires: libxslt, docbook-style-xsl
%endif %endif
%if %{undefined without_haddock} && %{undefined without_hscolour}
BuildRequires: hscolour
%endif
%if %{undefined without_testsuite} %if %{undefined without_testsuite}
BuildRequires: python BuildRequires: python
%endif %endif
@ -241,9 +236,6 @@ HADDOCK_DOCS = NO
%if %{defined without_manual} %if %{defined without_manual}
BUILD_DOCBOOK_HTML = NO BUILD_DOCBOOK_HTML = NO
%endif %endif
%if %{undefined without_hscolour}
HSCOLOUR_SRCS = NO
%endif
EOF EOF
export CFLAGS="${CFLAGS:-%optflags}" export CFLAGS="${CFLAGS:-%optflags}"
@ -432,6 +424,9 @@ fi
- use Karel Gardas' ARM hardfloat patch committed upstream - use Karel Gardas' ARM hardfloat patch committed upstream
- use _smp_mflags again - use _smp_mflags again
- disable Cabal building ghci lib files - disable Cabal building ghci lib files
- do not disable hscolour in build.mk
- drop the explicit hscolour BR
- without_hscolour should now be set by ghc-rpm-macros for bootstrapping
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4.1-6 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild