[arch-commits] Commit in ghc/trunk (4 files)

Thomas Dziedzic tdziedzic at archlinux.org
Thu Feb 23 21:53:37 EST 2012


    Date: Thursday, February 23, 2012 @ 21:53:37
  Author: tdziedzic
Revision: 150936

update for ghc 7.4.1

Added:
  ghc/trunk/print-provides-replaces.sh
Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/build.mk
  ghc/trunk/ghc.install

----------------------------+
 PKGBUILD                   |  117 ++++++++++++++++++++++++++++++++++---------
 build.mk                   |   59 +++++++++++++++------
 ghc.install                |   19 +-----
 print-provides-replaces.sh |   38 +++++++++++++
 4 files changed, 178 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-24 01:43:21 UTC (rev 150935)
+++ PKGBUILD	2012-02-24 02:53:37 UTC (rev 150936)
@@ -6,37 +6,106 @@
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 #   Also, due to dependency loop problems, haskell-ghc-paths and haddock
 #   do not carry version dependencies. You will have to remember to build them too.
+
 pkgname=ghc
-pkgver=7.2.2
-pkgrel=2
-pkgdesc="The Glasgow Haskell Compiler"
-arch=(i686 x86_64)
-url="http://www.haskell.org/ghc/"
-license=("custom")
-depends=('perl' 'gmp>=5.0' gcc)
-makedepends=(ghc happy perl libxslt docbook-xsl)
-install=ghc.install
-groups=(haskell)
-source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2"
-        build.mk)
+pkgver=7.4.1
+pkgrel=1
+pkgdesc='The Glasgow Haskell Compiler'
+arch=('i686' 'x86_64')
+url='http://www.haskell.org/ghc/'
+license=('custom')
+depends=('perl' 'gmp>=5.0' 'gcc')
+makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
+checkdepends=('python2')
+install='ghc.install'
+groups=('haskell')
+provides=('haskell-array=0.4.0.0'
+          'haskell-base=4.5.0.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.0'
+          'haskell-cabal=1.14.0'
+         )
+replaces=('haskell-array<0.4.0.0'
+          'haskell-base<4.5.0.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.0'
+          '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')
+md5sums=('5d86c420978b49cc60edea9bd4c36703'
+         '54bc9405c14c3226b6e3de3cd61e2777'
+         '82b67cdd24a2e434a4399f30f14b21a3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${pkgname}-${pkgver}
 
-  cp $srcdir/build.mk mk/build.mk
+  cp ${srcdir}/build.mk mk/build.mk
 
-  ./configure --prefix=/usr 
-  make -j1 
+  ./configure \
+    --prefix=/usr
+
+  make -j9
 }
 
+check() {
+  cd ${pkgname}-${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
+  # might be some failures
+  #make fulltest
+}
+
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  make DESTDIR=$pkgdir install
+  cd ${pkgname}-${pkgver}
 
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
-  install -d $pkgdir/usr/share/haskell
+  make DESTDIR=${pkgdir} install
+
+  install -d ${pkgdir}/usr/share/licenses/ghc
+  install -m644 LICENSE \
+    ${pkgdir}/usr/share/licenses/ghc
 }
-
-md5sums=('fa19d9fe5049b7a1352b0b7c9880c141'
-         '5a3e0880c80b1dcecf779ff2e63a9c0d')

Modified: build.mk
===================================================================
--- build.mk	2012-02-24 01:43:21 UTC (rev 150935)
+++ build.mk	2012-02-24 02:53:37 UTC (rev 150936)
@@ -7,15 +7,17 @@
 
 # Uncomment one of these to select a build profile below:
 
-# Full build with max optimisation (slow build)
+# Full build with max optimisation and everything enabled (very slow build)
 BuildFlavour = perf
 
-# Fastest build (libs unoptimised):
+# 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
 
-# Fast build with optimised libraries:
-#BuildFlavour = quick
-
 # Profile the stage2 compiler:
 #BuildFlavour = prof
 
@@ -25,6 +27,9 @@
 # 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--------------------------------
@@ -37,7 +42,7 @@
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O2 -fasm
 GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2 -XGenerics
+GhcLibHcOpts    = -O2
 GhcLibWays     += p
 
 ifeq "$(PlatformSupportsSharedLibs)" "YES"
@@ -112,6 +117,7 @@
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+LAX_DEPENDENCIES   = NO
 
 endif
 
@@ -128,23 +134,42 @@
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
+LAX_DEPENDENCIES   = NO
 
+# 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
 
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
+# -------- A Unregisterised build) -------------------------------------------
 
-# profiled RTS
-#GhcRtsCcOpts =  -pg -g
+ifeq "$(BuildFlavour)" "unreg"
 
-# Optimised/profiled RTS
-#GhcRtsCcOpts = -O2 -pg
+GhcUnregisterised    = YES
+GhcWithNativeCodeGen = NO
 
-#GhcRtsWithFrontPanel = YES
-#SRC_HC_OPTS += `gtk-config --libs`
+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=:
-
-
+STRIP_CMD = :

Modified: ghc.install
===================================================================
--- ghc.install	2012-02-24 01:43:21 UTC (rev 150935)
+++ ghc.install	2012-02-24 02:53:37 UTC (rev 150936)
@@ -1,19 +1,10 @@
-pkgname=ghc
-
 pre_upgrade() {
-    cat << EOF
-    ==> Unregistering cabalized packages...
-EOF
-    [ -d /usr/share/haskell ] && for unreg in /usr/share/haskell/*/unregister.sh; do "$a"; done
-    cat << EOF
-    ==> Done.
-EOF
-    
+  echo '==> Unregistering cabalized packages...'
+  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
+  echo '==> Done.'
 }
 
 post_upgrade() {
-    cat << EOF
-    ==> All cabalized and yaourt-installed packages need to be reinstalled now.
-    ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.
-EOF
+  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.'
 }

Added: print-provides-replaces.sh
===================================================================
--- print-provides-replaces.sh	                        (rev 0)
+++ print-provides-replaces.sh	2012-02-24 02:53:37 UTC (rev 150936)
@@ -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' '<'


Property changes on: ghc/trunk/print-provides-replaces.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*


More information about the arch-commits mailing list