[csw-devel] SF.net SVN: gar:[7638] csw/mgar/pkg/ghc/trunk
trygvis at users.sourceforge.net
trygvis at users.sourceforge.net
Wed Dec 16 20:22:47 CET 2009
Revision: 7638
http://gar.svn.sourceforge.net/gar/?rev=7638&view=rev
Author: trygvis
Date: 2009-12-16 19:22:47 +0000 (Wed, 16 Dec 2009)
Log Message:
-----------
ghc: Upgrading to 6.10.4. Fixing (as in removing) LD_LIBRARY_PATH requirement.
Modified Paths:
--------------
csw/mgar/pkg/ghc/trunk/Makefile
csw/mgar/pkg/ghc/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch
csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall
Removed Paths:
-------------
csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec
csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec
Property Changed:
----------------
csw/mgar/pkg/ghc/trunk/
Property changes on: csw/mgar/pkg/ghc/trunk
___________________________________________________________________
Modified: svn:ignore
- cookies
download
work
+ cookies
download
work
*.log
Modified: csw/mgar/pkg/ghc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghc/trunk/Makefile 2009-12-16 13:11:14 UTC (rev 7637)
+++ csw/mgar/pkg/ghc/trunk/Makefile 2009-12-16 19:22:47 UTC (rev 7638)
@@ -6,9 +6,11 @@
# software causes damage.
# TODO: Run the test suite
+# This assumes that you already have the stage1 compiler installed under ~/opencsw/ghc-bootstrap-$(GARVERSION)
+# Download it from http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/
GARNAME = ghc
-GARVERSION = 6.8.3
+GARVERSION = 6.10.4
CATEGORIES = apps
DESCRIPTION = State-of-the-art, compiler and interactive environment for Haskell.
@@ -23,82 +25,40 @@
GARCOMPILER = GCC4
-# Calculate the correct platform specification for ghc to use when bootstrapping
-ifeq ($(shell uname -p),sparc)
-GHC_PLATFORM = sparc-sun
-else
-GHC_PLATFORM = i386-unknown
-endif
+REQUIRED_PKGS_CSWghc = CSWiconv
+REQUIRED_PKGS_CSWghc += CSWlibgmp
+REQUIRED_PKGS_CSWghc += CSWncurses
# The location of the solaris binaries seems to vary a bit from version to version
+MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/
+DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2
+PATCHFILES = 0001-mk-build.mk-Adding-correct-runtime-options.patch
-MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/
-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,)
-
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARVERSION)/$(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
-PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi
-PKGFILES_CSWghc-prof += $(prefix)/.*\.so
+#PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi
+#PKGFILES_CSWghc-prof += $(prefix)/.*\.so
-#PKGFILES_CSWghc =
-#PKGFILES_CSWghc = $(prefix)/.*
-#PKGFILES_CSWghc += $(prefix)/.*\.a
-#PKGFILES_CSWghc += $(PKGFILES_DEVEL)
-#PKGFILES_CSWghc += $(PKGFILES_RT)
+MERGE_EXCLUDE_STATICLIBS =
+PKGFILES_CSWghc =
+PKGFILES_CSWghc = $(prefix)/.*
+PKGFILES_CSWghc += $(prefix)/.*\.a
+PKGFILES_CSWghc += $(PKGFILES_DEVEL)
+PKGFILES_CSWghc += $(PKGFILES_RT)
+
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-gcc=/opt/csw/gcc4/bin/gcc
+CONFIGURE_ARGS += --with-gmp-includes=/opt/csw/include
+CONFIGURE_ARGS += --with-gmp-libraries=/opt/csw/lib
+CONFIGURE_ARGS += --with-readline-includes=/opt/csw/include
+CONFIGURE_ARGS += --with-readline-libraries=/opt/csw/lib
+CONFIGURE_ENV = PATH=$(HOME)/opencsw/ghc-bootstrap-6.10.4/bin:$(PATH)
+
+BUILD_ENV = PATH=$(HOME)/opencsw/ghc-bootstrap-6.10.4/bin:$(PATH) LD_LIBRARY_PATH=/opt/csw/lib
+
# Disabled for now
TEST_SCRIPTS =
-#TEST_SCRIPTS = custom
include gar/category.mk
-
-# 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
-
-$(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 zxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz)
- false
- @$(MAKECOOKIE)
-
-test-custom:
- @echo *******************************
- @echo *** RUNNING TESTS (not)
- @echo *******************************
- @( cd $(WORKSRC)/testsuite/tests/ghc-regress; echo $(MAKE) stage=2 )
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/ghc/trunk/checksums
===================================================================
--- csw/mgar/pkg/ghc/trunk/checksums 2009-12-16 13:11:14 UTC (rev 7637)
+++ csw/mgar/pkg/ghc/trunk/checksums 2009-12-16 19:22:47 UTC (rev 7638)
@@ -1,6 +1,2 @@
-dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2
-c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz
-ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2
-907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2
-8f73e728ba2e6f65f738a302d1cc8ff4 download/CSWghc.gspec
-2a3d93a43a4499e0c3366f660ffda4bf download/CSWghc-prof.gspec
+d49c571bf1709965b97a8fc2e8f3398b 0001-mk-build.mk-Adding-correct-runtime-options.patch
+167687fa582ef6702aaac24e139ec982 ghc-6.10.4-src.tar.bz2
Added: csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch
===================================================================
--- csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch (rev 0)
+++ csw/mgar/pkg/ghc/trunk/files/0001-mk-build.mk-Adding-correct-runtime-options.patch 2009-12-16 19:22:47 UTC (rev 7638)
@@ -0,0 +1,20 @@
+From bb8a10ec43f99716c4767e0788dba2c36f66529b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Trygve=20Laugst=C3=B8l?= <trygvis at inamo.no>
+Date: Wed, 16 Dec 2009 15:18:57 +0100
+Subject: [PATCH] mk/build.mk: Adding correct runtime options.
+
+---
+ mk/build.mk | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 mk/build.mk
+
+diff --git a/mk/build.mk b/mk/build.mk
+new file mode 100644
+index 0000000..ab87adf
+--- /dev/null
++++ b/mk/build.mk
+@@ -0,0 +1 @@
++SRC_HC_OPTS=-optl-R/opt/csw/lib
+--
+1.6.5.1
+
Deleted: csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec
===================================================================
--- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-12-16 13:11:14 UTC (rev 7637)
+++ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-12-16 19:22:47 UTC (rev 7638)
@@ -1,14 +0,0 @@
-# Copyright 2008 OpenCSW
-#
-# Redistribution and/or use, with or without modification, is
-# permitted. This software is without warranty of any kind. The
-# author(s) shall not be liable in the event that use of the
-# software causes damage.
-
-%var bitname ghc_prof
-%var pkgname CSWghc-prof
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-
-Please see /opt/csw/share/doc/ghc_prof/LICENSE for license information
-
Deleted: csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec
===================================================================
--- csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-12-16 13:11:14 UTC (rev 7637)
+++ csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-12-16 19:22:47 UTC (rev 7638)
@@ -1,14 +0,0 @@
-# Copyright 2008 OpenCSW
-#
-# Redistribution and/or use, with or without modification, is
-# permitted. This software is without warranty of any kind. The
-# author(s) shall not be liable in the event that use of the
-# software causes damage.
-
-%var bitname ghc
-%var pkgname CSWghc
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-
-Please see /opt/csw/share/doc/ghc/LICENSE for license information
-
Added: csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall
===================================================================
--- csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall (rev 0)
+++ csw/mgar/pkg/ghc/trunk/files/CSWghc.postinstall 2009-12-16 19:22:47 UTC (rev 7638)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# Implement the procedure described here:
+# http://hackage.haskell.org/trac/ghc/wiki/Building/Solaris
+
+/opt/csw/bin/ghc-pkg describe rts > /tmp/rts.pkg.in
+
+cat /tmp/rts.pkg.in | sed \
+ -e "s, -R/opt/csw/lib ,,g" \
+ -e "s,^\(ld-options:\) \(.*\),\1 -R/opt/csw/lib \2," > /tmp/rts.pkg.out
+
+/opt/csw/bin/ghc-pkg update /tmp/rts.pkg.out
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list