Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8b5ada85fa94f0995889a2c95b7d8207ae263fac)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8b5ada85fa94f0995889a2c95b7d8207ae263fac)
  • Date: Thu, 19 May 2011 02:04:48 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

devel/ghc/HISTORY | 5 +++++
devel/ghc/PRE_BUILD | 10 ++++++++--
devel/ghc/build.mk.no-opts | 6 ------
3 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 8b5ada85fa94f0995889a2c95b7d8207ae263fac
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ghc: use ghc's build.mk.sample to select performance or fast build

diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index 0ba9d80..2d528b5 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,8 @@
+2011-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * build.mk.no-opts: removed, doesn't work with 7.0.3
+ * PRE_BUILD: use supplied build.mk.sample to select performance
+ or fast build according to the user's choice
+
2011-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.0.3
* PRE_BUILD: execute boot script
diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index e78da08..18e4368 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -8,8 +8,14 @@ fi &&

unpack_file &&

+cd ${SOURCE_DIRECTORY}/${SPELL}-${VERSION} &&
+
if [[ $GHC_NO_OPTS == "y" ]] ; then
- cp -v ${SCRIPT_DIRECTORY}/build.mk.no-opts
${SOURCE_DIRECTORY}/${SPELL}-${VERSION}/mk/build.mk
+ echo "BuildFlavour = quickest" > mk/build.mk.settings
+else
+ echo "BuildFlavour = perf" > mk/build.mk.settings
fi &&
-cd ${SOURCE_DIRECTORY}/${SPELL}-${VERSION} &&
+
+cat mk/build.mk.{settings,sample} > mk/build.mk &&
+
perl boot
diff --git a/devel/ghc/build.mk.no-opts b/devel/ghc/build.mk.no-opts
deleted file mode 100644
index 6b93e49..0000000
--- a/devel/ghc/build.mk.no-opts
+++ /dev/null
@@ -1,6 +0,0 @@
-# Provides options for very quick unoptimised build.
-
-SRC_HC_OPTS = -H64m -O0
-GhcLibHcOpts = -O -fasm
-GhcLibWays =
-SplitObjs = NO



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8b5ada85fa94f0995889a2c95b7d8207ae263fac), Florian Franzmann, 05/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page