From 193f6ef106e2840882151ae9f33a02246e8ea047 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 2 Jun 2010 09:01:01 +0000 Subject: [PATCH] Add xhtml package (a new dependency of Haddock; not installed/shipped) --- ghc.mk | 6 +++++- packages | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ghc.mk b/ghc.mk index 4640b7f..eaf0e29 100644 --- a/ghc.mk +++ b/ghc.mk @@ -335,6 +335,7 @@ $(eval $(call addPackage,binary)) $(eval $(call addPackage,bin-package-db)) $(eval $(call addPackage,mtl)) $(eval $(call addPackage,utf8-string)) +$(eval $(call addPackage,xhtml)) $(eval $(call addPackage,terminfo,($$(Windows),NO))) @@ -653,6 +654,9 @@ $(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += libraries/binary_dist-install_HC_OPTS += -Wwarn libraries/binary_dist-boot_HC_OPTS += -Wwarn +# XXX hack: xhtml has warnings +libraries/xhtml_dist-install_HC_OPTS += -Wwarn + # ---------------------------------------------- # A useful pseudo-target .PHONY: stage1_libs @@ -876,7 +880,7 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif -INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES)) +INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string xhtml,$(PACKAGES)) ifeq "$(InstallExtraPackages)" "NO" INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES)) endif diff --git a/packages b/packages index 33748a0..5643dd1 100644 --- a/packages +++ b/packages @@ -61,6 +61,7 @@ libraries/terminfo packages/terminfo darcs libraries/unix packages/unix darcs libraries/utf8-string packages/utf8-string darcs libraries/Win32 packages/Win32 darcs +libraries/xhtml packages/xhtml darcs testsuite testsuite testsuite darcs nofib nofib nofib darcs libraries/deepseq extra packages/deepseq darcs -- 1.7.10.4