mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Loosen make restart checks a bit to fix build on certain

Browse Source 
configurations (e.g. pointyhat)

PR:		ports/168761
Submitted by:	Roman Naumann <namor@hemio.de>
This commit is contained in:
Gabor Pali 2012-06-08 16:11:47 +00:00
parent d52f4f84ad
commit a203787714
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=298769
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lang/ghc/files/patch-ghc.mk
View File

@ -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"