From a8defd8a5c2efbff5093717449afe73abb5cd8f7 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 12 Jun 2011 19:58:04 +0100 Subject: [PATCH 1/1] Fix building of optional packages The change to the packages file format broke it --- packages | 5 ++++- rules/extra-packages.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages b/packages index 1489f3e..923b620 100644 --- a/packages +++ b/packages @@ -1,5 +1,8 @@ # Despite the name "package", this file contains the master list of -# the *repositories* that make up GHC. It is parsed by boot and sync-all. +# the *repositories* that make up GHC. It is parsed by +# * boot +# * sync-all +# * rules/extra-packages.mk # # Some of this information is duplicated elsewhere in the build system: # See Trac #3896 diff --git a/rules/extra-packages.mk b/rules/extra-packages.mk index 1cef9ad..e3af94f 100644 --- a/rules/extra-packages.mk +++ b/rules/extra-packages.mk @@ -27,7 +27,7 @@ # add P to the list of packages define extra-packages -$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+ \+[^ ]\+' packages | sed 's/ .*//'))),\ +$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+$$$$' packages | sed 's/ .*//'))),\ $$(if $$(wildcard libraries/$$p/ghc-packages),\ $$(eval BUILD_DIRS += libraries/$$p) \ $$(foreach q,$$(shell cat libraries/$$p/ghc-packages2),$$(eval $$(call extra-package,$$p,$$p/$$q))),\ -- 1.7.10.4