projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d529d59
)
Add xhtml package (a new dependency of Haddock; not installed/shipped)
author
Simon Marlow
<marlowsd@gmail.com>
Wed, 2 Jun 2010 09:01:01 +0000
(09:01 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Wed, 2 Jun 2010 09:01:01 +0000
(09:01 +0000)
ghc.mk
patch
|
blob
|
history
packages
patch
|
blob
|
history
diff --git
a/ghc.mk
b/ghc.mk
index
4640b7f
..
eaf0e29
100644
(file)
--- 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,bin-package-db))
$(eval $(call addPackage,mtl))
$(eval $(call addPackage,utf8-string))
+$(eval $(call addPackage,xhtml))
$(eval $(call addPackage,terminfo,($$(Windows),NO)))
$(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
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
# ----------------------------------------------
# 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_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
ifeq "$(InstallExtraPackages)" "NO"
INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES))
endif
diff --git
a/packages
b/packages
index
33748a0
..
5643dd1
100644
(file)
--- 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/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
testsuite testsuite testsuite darcs
nofib nofib nofib darcs
libraries/deepseq extra packages/deepseq darcs