Bug 17276

Summary: Fix for ports/lang/ghc
Product: Ports & Packages Reporter: Simon Marlow <simonm>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Simon Marlow 2000-03-09 02:30:00 UTC
I forgot to include one of the patch files in the recent upgrade of
ports/lang/ghc to version 4.06.  The file patch-ab is included below.

Fix: ports/lang/ghc/patches/patch-ab follows:

+ #
+ # There's no need to compute dependencies when booting from .hc files
+ #
+ ifneq "$(GhcWithHscBuiltViaC)" "YES"
+ MKDEPENDHS_SRCS = $(HS_SRCS)
+ else
+ MKDEPENDHS_SRCS =
+ endif
+ 
ifneq "$(way)" "dll"
SRC_HC_OPTS += -static
endif
***************


endif # HSLIB /= ""
+ 
+ # When booting from .hc files, remove the suffix rule for 
+ # .l?hs -> .o, so that the .hc -> .o is used instead.
+ # Also disable the generation of the .hc files, even if
+ # the .l?hs files are newer than the .hc ones.
+ ifeq "$(GhcWithHscBuiltViaC)" "YES"
+ %.$(way_)o  : %.lhs
+ %.$(way_)o  : %.hs
+ %.$(way_)hc : %.lhs
+ %.$(way_)hc : %.hs
+ endif

endif # HsLibsFor = ghc--wRQ5CVWBjmM9VBuRbfmjeOG3volCSLDL3MTkn3Hci4Z7S6Pk
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

*** hslibs/mk/target.mk~         Sun Jan 30 11:37:45 2000
--- hslibs/mk/target.mk  Sun Jan 30 11:32:10 2000
***************
*** 70,75 ****
--- 70,84 ----
MAGIC_HSCPP_OPTS=-DBEGIN_FOR_GHC='-}' -DEND_FOR_GHC='{-' -DBEGIN_FOR_HUGS='{-' -DEND_FOR_HUGS='-}'
SRC_MKDEPENDHS_OPTS += -optdep-w $(MAGIC_HSCPP_OPTS)
Comment 1 Thomas Gellekum freebsd_committer freebsd_triage 2000-03-10 11:45:17 UTC
State Changed
From-To: open->closed

Committed, thanks.