Revision: 2689
http://gar.svn.sourceforge.net/gar/?rev=2689&view=rev
Author: trygvis
Date: 2008-12-23 15:36:04 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
o Downloading and extracting the bootstrap blob correctly.
Modified Paths:
--------------
csw/mgar/pkg/ghc/trunk/Makefile
csw/mgar/pkg/ghc/trunk/checksums
Modified: csw/mgar/pkg/ghc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghc/trunk/Makefile 2008-12-22 22:03:18 UTC (rev 2688)
+++ csw/mgar/pkg/ghc/trunk/Makefile 2008-12-23 15:36:04 UTC (rev 2689)
@@ -5,8 +5,7 @@
# author(s) shall not be liable in the event that use of the
# software causes damage.
-# TODO: Unpack the bootstrap binaries. Right now they're assumed to be
installed under /tmp/ghc.
-# Might not be too useful when re-building this package.
+# TODO: Run the test suite
GARNAME = ghc
GARVERSION = 6.8.3
@@ -34,7 +33,9 @@
# The location of the solaris binaries seems to vary a bit from version to
version
MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/
http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/
-DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2
ghc-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2
testsuite-$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2
testsuite-$(GARVERSION).tar.gz
+DISTFILES += $(GARNAME)-$(GARVERSION)-sparc-sun-solaris2.tar.bz2
+DISTFILES += $(GARNAME)-$(GARVERSION)-i386-unknown-solaris2.tar.bz2
DISTFILES += $(call admfiles,CSW$(GARNAME),)
DISTFILES += $(call admfiles,CSW$(GARNAME)-prof,)
@@ -50,18 +51,41 @@
include gar/category.mk
-PATH := /tmp/ghc/bin:$(PATH)
+# Prevent the extracttion of the binary blobs. This has to be after GAR is
included
+tar-bz-extract-ghc-$(GARVERSION)-sparc-sun-solaris2.tar.bz2:
+ @$(MAKECOOKIE)
+tar-bz-extract-ghc-$(GARVERSION)-i386-unknown-solaris2.tar.bz2:
+ @$(MAKECOOKIE)
+
+STAGE_1_FILE =
$(DOWNLOADDIR)/$(GARNAME)-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2
+STAGE_1_BASEDIR=$(WORKDIR)/stage1
+STAGE_1_SRC_DIR=$(STAGE_1_BASEDIR)/ghc-$(GARVERSION)
+STAGE_1_DIR=$(shell mkdir -p $(STAGE_1_BASEDIR) && cd $(STAGE_1_BASEDIR) &&
pwd)/ghc
+
+PATH := $(STAGE_1_DIR)/bin:$(PATH)
+
LD_LIBRARY_PATH=/opt/csw/lib
export LD_LIBRARY_PATH
-# This might not be needed anymore
-pre-build-modulated:
- @( cd $(WORKSRC); $(MAKE) -C utils/pwd boot )
+$(STAGE_1_SRC_DIR):
+ @echo Extracting the bootstrap compiler
+ mkdir -p $(STAGE_1_BASEDIR)
+ cat $(STAGE_1_FILE) | ( cd $(STAGE_1_BASEDIR) && gtar jxf -)
+$(STAGE_1_SRC_DIR)/Makefile: $(STAGE_1_SRC_DIR)
+ cd $(STAGE_1_SRC_DIR) && ./configure --prefix=$(STAGE_1_DIR)
+
+$(STAGE_1_DIR)/bin/ghc: $(STAGE_1_SRC_DIR)/Makefile
+ cd $(STAGE_1_SRC_DIR) && gmake install
+
+pre-configure-modulated: $(STAGE_1_DIR)/bin/ghc
+ echo $$PATH
+ @$(MAKECOOKIE)
+
pre-test-custom:
@echo Extracting the testsuite
- @( echo cd $(WORKSRC); echo gtar jxf
$(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz)
+ @( echo cd $(WORKSRC); echo gtar zxf
$(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz)
false
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/ghc/trunk/checksums
===================================================================
--- csw/mgar/pkg/ghc/trunk/checksums 2008-12-22 22:03:18 UTC (rev 2688)
+++ csw/mgar/pkg/ghc/trunk/checksums 2008-12-23 15:36:04 UTC (rev 2689)
@@ -1,4 +1,5 @@
dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2
+ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2
907c15e1d7d33dfd5a829936fe18176a
download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2
c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz
41b4ca8ae020320be23571cd8a71d4dd download/CSWghc.gspec
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
