diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2012-06-08 16:11:47 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2012-06-08 16:11:47 +0000 |
| commit | a203787714f663260e95d81a8cceca73c719a37d (patch) | |
| tree | b1099953e9dd4b1425b06732fad93ea11edcf414 /lang/ghc | |
| parent | Convert to optionsng (diff) | |
- Loosen make restart checks a bit to fix build on certain
configurations (e.g. pointyhat)
PR: ports/168761
Submitted by: Roman Naumann <namor@hemio.de>
Notes
Notes:
svn path=/head/; revision=298769
Diffstat (limited to 'lang/ghc')
| -rw-r--r-- | lang/ghc/files/patch-ghc.mk | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk index 892e2fdfdbcc..8844713ad7f5 100644 --- a/lang/ghc/files/patch-ghc.mk +++ b/lang/ghc/files/patch-ghc.mk @@ -1,14 +1,22 @@ $FreeBSD$ ---- ghc.mk.orig -+++ ghc.mk -@@ -293,6 +293,8 @@ - # ----------------------------------------------------------------------------- - # Building libraries +--- ghc.mk.orig 2012-02-01 19:10:32.000000000 +0100 ++++ ghc.mk 2012-06-08 17:39:40.000000000 +0200 +@@ -81,6 +81,7 @@ + # Catch make if it runs away into an infinite loop + ifeq "$(MAKE_RESTARTS)" "" + else ifeq "$(MAKE_RESTARTS)" "1" ++else ifeq "$(MAKE_RESTARTS)" "2" + else + $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?) + endif +@@ -377,6 +378,8 @@ + endif + endef +PACKAGES = + define addPackage # args: $1 = package, $2 = condition - ifneq "$2" "" - ifeq "$$(CLEANING)" "YES" + ifneq "$(filter $1,$(PKGS_THAT_USE_TH)) $(GhcProfiled)" "$1 YES" + ifeq "$(filter $1,$(PKGS_THAT_BUILD_WITH_STAGE2))" "$1" |