Date: Sunday, June 10, 2012 @ 20:03:29 Author: tdziedzic Revision: 161393
archrelease: copy trunk to staging-i686, staging-x86_64 Added: ghc/repos/staging-i686/ ghc/repos/staging-i686/PKGBUILD (from rev 161392, ghc/trunk/PKGBUILD) ghc/repos/staging-i686/build.mk (from rev 161392, ghc/trunk/build.mk) ghc/repos/staging-i686/ghc.install (from rev 161392, ghc/trunk/ghc.install) ghc/repos/staging-i686/print-provides-replaces.sh (from rev 161392, ghc/trunk/print-provides-replaces.sh) ghc/repos/staging-i686/silence-gen_contents_index.diff (from rev 161392, ghc/trunk/silence-gen_contents_index.diff) ghc/repos/staging-x86_64/ ghc/repos/staging-x86_64/PKGBUILD (from rev 161392, ghc/trunk/PKGBUILD) ghc/repos/staging-x86_64/build.mk (from rev 161392, ghc/trunk/build.mk) ghc/repos/staging-x86_64/ghc.install (from rev 161392, ghc/trunk/ghc.install) ghc/repos/staging-x86_64/print-provides-replaces.sh (from rev 161392, ghc/trunk/print-provides-replaces.sh) ghc/repos/staging-x86_64/silence-gen_contents_index.diff (from rev 161392, ghc/trunk/silence-gen_contents_index.diff) ------------------------------------------------+ staging-i686/PKGBUILD | 120 +++++++++++++++ staging-i686/build.mk | 175 +++++++++++++++++++++++ staging-i686/ghc.install | 10 + staging-i686/print-provides-replaces.sh | 38 ++++ staging-i686/silence-gen_contents_index.diff | 10 + staging-x86_64/PKGBUILD | 120 +++++++++++++++ staging-x86_64/build.mk | 175 +++++++++++++++++++++++ staging-x86_64/ghc.install | 10 + staging-x86_64/print-provides-replaces.sh | 38 ++++ staging-x86_64/silence-gen_contents_index.diff | 10 + 10 files changed, 706 insertions(+) Copied: ghc/repos/staging-i686/PKGBUILD (from rev 161392, ghc/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,120 @@ +# $Id$ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Maintainer: Vesa Kaihlavirta <v...@archlinux.org> +# Special note for devs looking to upgrade this package: +# ghc places a unique hash for each library when it is built. +# Libraries depend on versions specified by those hashes. +# This implies that all libraries need to be rebuilt when ghc is rebuilt. + +pkgname=ghc +pkgver=7.4.2 +pkgrel=1 +pkgdesc='The Glasgow Haskell Compiler' +arch=('i686' 'x86_64') +url='http://www.haskell.org/ghc/' +license=('custom') +# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496 +depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi') +makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl') +checkdepends=('python2') +install='ghc.install' +# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... +options=('!makeflags') +# missing rtl? +provides=('haskell-array=0.4.0.0' + 'haskell-base=4.5.1.0' + 'haskell-binary=0.5.1.0' + 'haskell-bin-package-db=0.0.0.0' + 'haskell-bytestring=0.9.2.1' + 'haskell-containers=0.4.2.1' + 'haskell-deepseq=1.3.0.0' + 'haskell-directory=1.1.0.2' + 'haskell-extensible-exceptions=0.1.1.4' + 'haskell-filepath=1.3.0.0' + 'haskell-ghc-prim=0.2.0.0' + 'haskell-haskell2010=1.1.0.1' + 'haskell-haskell98=2.0.0.1' + 'haskell-hoopl=3.8.7.3' + 'haskell-hpc=0.5.1.1' + 'haskell-integer-gmp=0.4.0.0' + 'haskell-old-locale=1.0.0.4' + 'haskell-old-time=1.1.0.0' + 'haskell-pretty=1.1.1.0' + 'haskell-process=1.1.0.1' + 'haskell-template-haskell=2.7.0.0' + 'haskell-time=1.4' + 'haskell-unix=2.5.1.1' + 'haskell-cabal=1.14.0' + ) +replaces=('haskell-array<0.4.0.0' + 'haskell-base<4.5.1.0' + 'haskell-binary<0.5.1.0' + 'haskell-bin-package-db<0.0.0.0' + 'haskell-bytestring<0.9.2.1' + 'haskell-containers<0.4.2.1' + 'haskell-deepseq<1.3.0.0' + 'haskell-directory<1.1.0.2' + 'haskell-extensible-exceptions<0.1.1.4' + 'haskell-filepath<1.3.0.0' + 'haskell-ghc-prim<0.2.0.0' + 'haskell-haskell2010<1.1.0.1' + 'haskell-haskell98<2.0.0.1' + 'haskell-hoopl<3.8.7.3' + 'haskell-hpc<0.5.1.1' + 'haskell-integer-gmp<0.4.0.0' + 'haskell-old-locale<1.0.0.4' + 'haskell-old-time<1.1.0.0' + 'haskell-pretty<1.1.1.0' + 'haskell-process<1.1.0.1' + 'haskell-template-haskell<2.7.0.0' + 'haskell-time<1.4' + 'haskell-unix<2.5.1.1' + 'haskell-cabal<1.14.0' + ) +source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" + "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" + 'build.mk' + 'silence-gen_contents_index.diff') +md5sums=('267462db5c5a7c245fb26361b77007c4' + '528005749c761fe6c12a0079bd84fb90' + '88ad4108c26f56fc38466d82aaf9a295' + '2ac480d025b706fc47acc58c54b246bb') + +build() { + cd ghc-${pkgver} + + # Silence gen_contents_index for the common case. + # http://hackage.haskell.org/trac/ghc/ticket/5992 + patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff + + cp ${srcdir}/build.mk mk/build.mk + + ./configure \ + --prefix=/usr + + make +} + +check() { + cd ghc-${pkgver} + + # python2 rename + sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk + sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py + + # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 + #make THREADS=9 test + make test + # might be some failures + #make fulltest +} + +package() { + cd ghc-${pkgver} + + make DESTDIR=${pkgdir} install + + install -d ${pkgdir}/usr/share/licenses/ghc + install -m644 LICENSE \ + ${pkgdir}/usr/share/licenses/ghc +} Copied: ghc/repos/staging-i686/build.mk (from rev 161392, ghc/trunk/build.mk) =================================================================== --- staging-i686/build.mk (rev 0) +++ staging-i686/build.mk 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,175 @@ +# ----------------------------------------------------------------------------- +# A Sample build.mk +# +# Uncomment one of the following BuildFlavour settings to get the desired +# overall build type, and then tweak the options in the relevant section +# below. + +# Uncomment one of these to select a build profile below: + +# Full build with max optimisation and everything enabled (very slow build) +BuildFlavour = perf + +# Fast build with optimised libraries, no profiling (RECOMMENDED): +#BuildFlavour = quick + +# Even faster build. NOT RECOMMENDED: the libraries will be +# completely unoptimised, so any code built with this compiler +# (including stage2) will run very slowly: +#BuildFlavour = quickest + +# Profile the stage2 compiler: +#BuildFlavour = prof + +# A development build, working on the stage 1 compiler: +#BuildFlavour = devel1 + +# A development build, working on the stage 2 compiler: +#BuildFlavour = devel2 + +# An unregisterised, optimised build of ghc, for porting: +#BuildFlavour = unreg + +GhcLibWays = v + +# -------- 1. A Performance/Distribution build-------------------------------- + +ifeq "$(BuildFlavour)" "perf" + +# perf matches the default settings, repeated here for comparison: + +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O2 -fasm +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +GhcLibWays += p + +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn +endif + +endif + +# -------- A Fast build ------------------------------------------------------ + +ifeq "$(BuildFlavour)" "quickest" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O0 -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- A Fast build with optimised libs ---------------------------------- + +ifeq "$(BuildFlavour)" "quick" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- Profile the stage2 compiler --------------------------------------- + +ifeq "$(BuildFlavour)" "prof" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O -fasm +GhcLibHcOpts = -O -fasm + +GhcLibWays += p +GhcProfiled = YES + +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + + +# -------- A Development build (stage 1) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel1" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG +GhcStage2HcOpts = -Rghc-timing -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO +LAX_DEPENDENCIES = YES + +endif + +# -------- A Development build (stage 2) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel2" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O -fasm +GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO +LAX_DEPENDENCIES = YES + +# After stage 1 and the libraries have been built, you can uncomment this line: + +# stage=2 + +# Then stage 1 will not be touched by the build system, until +# you comment the line again. This is a useful trick for when you're +# working on stage 2 and want to freeze stage 1 and the libraries for +# a while. + +endif + +# -------- A Unregisterised build) ------------------------------------------- + +ifeq "$(BuildFlavour)" "unreg" + +GhcUnregisterised = YES +GhcWithNativeCodeGen = NO + +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O +GhcStage2HcOpts = -O2 +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# ----------------------------------------------------------------------------- +# Other settings that might be useful + +# NoFib settings +NoFibWays = +STRIP_CMD = : Copied: ghc/repos/staging-i686/ghc.install (from rev 161392, ghc/trunk/ghc.install) =================================================================== --- staging-i686/ghc.install (rev 0) +++ staging-i686/ghc.install 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,10 @@ +pre_upgrade() { + echo '==> Unregistering cabalized packages...' + [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \; + echo '==> Done.' +} + +post_upgrade() { + echo '==> All cabalized packages need to be reinstalled now.' + echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.' +} Copied: ghc/repos/staging-i686/print-provides-replaces.sh (from rev 161392, ghc/trunk/print-provides-replaces.sh) =================================================================== --- staging-i686/print-provides-replaces.sh (rev 0) +++ staging-i686/print-provides-replaces.sh 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,38 @@ +#!/bin/bash + +. PKGBUILD + +if [[ ! -d src/ghc-${pkgver}/libraries ]]; then + echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/" + exit 1 +fi + +declare -A exclude +# no Win32 cause we're not building on windows +exclude['Win32']=1 +# no integer-simple because we use integer-gmp +exclude['integer-simple']=1 +# extract excluded libraries from ghc.mk +for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do + exclude[${exclude_pkg}]=1 +done + +cd src/ghc-${pkgver}/libraries + +# $1 is the name of the variable +# $2 is the string for the test, either '=' or '<' +print_var() { + printf "$1=(" + for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do + [[ ${exclude[${pkg}]} ]] && continue + version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal) + printf "'haskell-$pkg$2$version'\n " + done + # also add cabal + version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal) + printf "'haskell-cabal$2$version'\n " + echo -e '\b)' +} + +print_var 'provides' '=' +print_var 'replaces' '<' Copied: ghc/repos/staging-i686/silence-gen_contents_index.diff (from rev 161392, ghc/trunk/silence-gen_contents_index.diff) =================================================================== --- staging-i686/silence-gen_contents_index.diff (rev 0) +++ staging-i686/silence-gen_contents_index.diff 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,10 @@ +--- ghc-7.4.2/libraries/gen_contents_index.original 2012-06-10 22:23:28.810059378 +0000 ++++ ghc-7.4.2/libraries/gen_contents_index 2012-06-10 22:24:00.289814576 +0000 +@@ -47,7 +47,6 @@ + esac + + # Now create the combined contents and index pages +-echo $HADDOCK_ARGS + $HADDOCK --gen-index --gen-contents -o . \ + -t "Haskell Hierarchical Libraries" \ + -p "prologue.txt" \ Copied: ghc/repos/staging-x86_64/PKGBUILD (from rev 161392, ghc/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,120 @@ +# $Id$ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Maintainer: Vesa Kaihlavirta <v...@archlinux.org> +# Special note for devs looking to upgrade this package: +# ghc places a unique hash for each library when it is built. +# Libraries depend on versions specified by those hashes. +# This implies that all libraries need to be rebuilt when ghc is rebuilt. + +pkgname=ghc +pkgver=7.4.2 +pkgrel=1 +pkgdesc='The Glasgow Haskell Compiler' +arch=('i686' 'x86_64') +url='http://www.haskell.org/ghc/' +license=('custom') +# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496 +depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi') +makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl') +checkdepends=('python2') +install='ghc.install' +# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... +options=('!makeflags') +# missing rtl? +provides=('haskell-array=0.4.0.0' + 'haskell-base=4.5.1.0' + 'haskell-binary=0.5.1.0' + 'haskell-bin-package-db=0.0.0.0' + 'haskell-bytestring=0.9.2.1' + 'haskell-containers=0.4.2.1' + 'haskell-deepseq=1.3.0.0' + 'haskell-directory=1.1.0.2' + 'haskell-extensible-exceptions=0.1.1.4' + 'haskell-filepath=1.3.0.0' + 'haskell-ghc-prim=0.2.0.0' + 'haskell-haskell2010=1.1.0.1' + 'haskell-haskell98=2.0.0.1' + 'haskell-hoopl=3.8.7.3' + 'haskell-hpc=0.5.1.1' + 'haskell-integer-gmp=0.4.0.0' + 'haskell-old-locale=1.0.0.4' + 'haskell-old-time=1.1.0.0' + 'haskell-pretty=1.1.1.0' + 'haskell-process=1.1.0.1' + 'haskell-template-haskell=2.7.0.0' + 'haskell-time=1.4' + 'haskell-unix=2.5.1.1' + 'haskell-cabal=1.14.0' + ) +replaces=('haskell-array<0.4.0.0' + 'haskell-base<4.5.1.0' + 'haskell-binary<0.5.1.0' + 'haskell-bin-package-db<0.0.0.0' + 'haskell-bytestring<0.9.2.1' + 'haskell-containers<0.4.2.1' + 'haskell-deepseq<1.3.0.0' + 'haskell-directory<1.1.0.2' + 'haskell-extensible-exceptions<0.1.1.4' + 'haskell-filepath<1.3.0.0' + 'haskell-ghc-prim<0.2.0.0' + 'haskell-haskell2010<1.1.0.1' + 'haskell-haskell98<2.0.0.1' + 'haskell-hoopl<3.8.7.3' + 'haskell-hpc<0.5.1.1' + 'haskell-integer-gmp<0.4.0.0' + 'haskell-old-locale<1.0.0.4' + 'haskell-old-time<1.1.0.0' + 'haskell-pretty<1.1.1.0' + 'haskell-process<1.1.0.1' + 'haskell-template-haskell<2.7.0.0' + 'haskell-time<1.4' + 'haskell-unix<2.5.1.1' + 'haskell-cabal<1.14.0' + ) +source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" + "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" + 'build.mk' + 'silence-gen_contents_index.diff') +md5sums=('267462db5c5a7c245fb26361b77007c4' + '528005749c761fe6c12a0079bd84fb90' + '88ad4108c26f56fc38466d82aaf9a295' + '2ac480d025b706fc47acc58c54b246bb') + +build() { + cd ghc-${pkgver} + + # Silence gen_contents_index for the common case. + # http://hackage.haskell.org/trac/ghc/ticket/5992 + patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff + + cp ${srcdir}/build.mk mk/build.mk + + ./configure \ + --prefix=/usr + + make +} + +check() { + cd ghc-${pkgver} + + # python2 rename + sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk + sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py + + # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 + #make THREADS=9 test + make test + # might be some failures + #make fulltest +} + +package() { + cd ghc-${pkgver} + + make DESTDIR=${pkgdir} install + + install -d ${pkgdir}/usr/share/licenses/ghc + install -m644 LICENSE \ + ${pkgdir}/usr/share/licenses/ghc +} Copied: ghc/repos/staging-x86_64/build.mk (from rev 161392, ghc/trunk/build.mk) =================================================================== --- staging-x86_64/build.mk (rev 0) +++ staging-x86_64/build.mk 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,175 @@ +# ----------------------------------------------------------------------------- +# A Sample build.mk +# +# Uncomment one of the following BuildFlavour settings to get the desired +# overall build type, and then tweak the options in the relevant section +# below. + +# Uncomment one of these to select a build profile below: + +# Full build with max optimisation and everything enabled (very slow build) +BuildFlavour = perf + +# Fast build with optimised libraries, no profiling (RECOMMENDED): +#BuildFlavour = quick + +# Even faster build. NOT RECOMMENDED: the libraries will be +# completely unoptimised, so any code built with this compiler +# (including stage2) will run very slowly: +#BuildFlavour = quickest + +# Profile the stage2 compiler: +#BuildFlavour = prof + +# A development build, working on the stage 1 compiler: +#BuildFlavour = devel1 + +# A development build, working on the stage 2 compiler: +#BuildFlavour = devel2 + +# An unregisterised, optimised build of ghc, for porting: +#BuildFlavour = unreg + +GhcLibWays = v + +# -------- 1. A Performance/Distribution build-------------------------------- + +ifeq "$(BuildFlavour)" "perf" + +# perf matches the default settings, repeated here for comparison: + +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O2 -fasm +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +GhcLibWays += p + +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn +endif + +endif + +# -------- A Fast build ------------------------------------------------------ + +ifeq "$(BuildFlavour)" "quickest" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O0 -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- A Fast build with optimised libs ---------------------------------- + +ifeq "$(BuildFlavour)" "quick" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- Profile the stage2 compiler --------------------------------------- + +ifeq "$(BuildFlavour)" "prof" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O -fasm +GhcLibHcOpts = -O -fasm + +GhcLibWays += p +GhcProfiled = YES + +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + + +# -------- A Development build (stage 1) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel1" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG +GhcStage2HcOpts = -Rghc-timing -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO +LAX_DEPENDENCIES = YES + +endif + +# -------- A Development build (stage 2) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel2" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O -fasm +GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO +LAX_DEPENDENCIES = YES + +# After stage 1 and the libraries have been built, you can uncomment this line: + +# stage=2 + +# Then stage 1 will not be touched by the build system, until +# you comment the line again. This is a useful trick for when you're +# working on stage 2 and want to freeze stage 1 and the libraries for +# a while. + +endif + +# -------- A Unregisterised build) ------------------------------------------- + +ifeq "$(BuildFlavour)" "unreg" + +GhcUnregisterised = YES +GhcWithNativeCodeGen = NO + +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O +GhcStage2HcOpts = -O2 +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# ----------------------------------------------------------------------------- +# Other settings that might be useful + +# NoFib settings +NoFibWays = +STRIP_CMD = : Copied: ghc/repos/staging-x86_64/ghc.install (from rev 161392, ghc/trunk/ghc.install) =================================================================== --- staging-x86_64/ghc.install (rev 0) +++ staging-x86_64/ghc.install 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,10 @@ +pre_upgrade() { + echo '==> Unregistering cabalized packages...' + [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \; + echo '==> Done.' +} + +post_upgrade() { + echo '==> All cabalized packages need to be reinstalled now.' + echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.' +} Copied: ghc/repos/staging-x86_64/print-provides-replaces.sh (from rev 161392, ghc/trunk/print-provides-replaces.sh) =================================================================== --- staging-x86_64/print-provides-replaces.sh (rev 0) +++ staging-x86_64/print-provides-replaces.sh 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,38 @@ +#!/bin/bash + +. PKGBUILD + +if [[ ! -d src/ghc-${pkgver}/libraries ]]; then + echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/" + exit 1 +fi + +declare -A exclude +# no Win32 cause we're not building on windows +exclude['Win32']=1 +# no integer-simple because we use integer-gmp +exclude['integer-simple']=1 +# extract excluded libraries from ghc.mk +for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do + exclude[${exclude_pkg}]=1 +done + +cd src/ghc-${pkgver}/libraries + +# $1 is the name of the variable +# $2 is the string for the test, either '=' or '<' +print_var() { + printf "$1=(" + for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do + [[ ${exclude[${pkg}]} ]] && continue + version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal) + printf "'haskell-$pkg$2$version'\n " + done + # also add cabal + version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal) + printf "'haskell-cabal$2$version'\n " + echo -e '\b)' +} + +print_var 'provides' '=' +print_var 'replaces' '<' Copied: ghc/repos/staging-x86_64/silence-gen_contents_index.diff (from rev 161392, ghc/trunk/silence-gen_contents_index.diff) =================================================================== --- staging-x86_64/silence-gen_contents_index.diff (rev 0) +++ staging-x86_64/silence-gen_contents_index.diff 2012-06-11 00:03:29 UTC (rev 161393) @@ -0,0 +1,10 @@ +--- ghc-7.4.2/libraries/gen_contents_index.original 2012-06-10 22:23:28.810059378 +0000 ++++ ghc-7.4.2/libraries/gen_contents_index 2012-06-10 22:24:00.289814576 +0000 +@@ -47,7 +47,6 @@ + esac + + # Now create the combined contents and index pages +-echo $HADDOCK_ARGS + $HADDOCK --gen-index --gen-contents -o . \ + -t "Haskell Hierarchical Libraries" \ + -p "prologue.txt" \