From owner-freebsd-ports  Wed Mar  8 18:30: 6 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 741A437B71E
	for <freebsd-ports@FreeBSD.org>; Wed,  8 Mar 2000 18:30:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id SAA71727;
	Wed, 8 Mar 2000 18:30:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from tantalum.btinternet.com (tantalum.btinternet.com [194.73.73.80])
	by hub.freebsd.org (Postfix) with ESMTP id 1EBBC37B71B
	for <freebsd-gnats-submit@freebsd.org>; Wed,  8 Mar 2000 18:20:15 -0800 (PST)
	(envelope-from simonm@jaffacakes.freeserve.co.uk)
Received: from [62.6.65.161] (helo=jaffacakes.freeserve.co.uk)
	by ruthenium with esmtp (Exim 2.05 #1)
	id 12SpND-0000y8-00
	for freebsd-gnats-submit@freebsd.org; Wed, 8 Mar 2000 22:56:12 +0000
Received: by jaffacakes.freeserve.co.uk (8.9.3/8.9.3) id WAA03584
	for freebsd-gnats-submit@freebsd.org; Wed, 8 Mar 2000 22:54:05 GMT
	(envelope-from simonm)
Message-Id: <00030822540300.03250@rachel.home>
Date: Wed, 8 Mar 2000 22:53:05 +0000
From: Simon Marlow <simonm@jaffacakes.freeserve.co.uk>
To: freebsd-gnats-submit@freebsd.org
Subject: ports/17276: Fix for ports/lang/ghc
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         17276
>Category:       ports
>Synopsis:       Fix for ports/lang/ghc
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar  8 18:30:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Simon Marlow
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:
>Description:

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.

>How-To-Repeat:
>Fix:

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

*** 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)

+ #
+ # 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
***************
*** 115,120 ****
--- 124,140 ----
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




>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message