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

Felix Yan fyan at archlinux.org
Tue May 24 13:46:24 UTC 2016


    Date: Tuesday, May 24, 2016 @ 15:46:23
  Author: fyan
Revision: 176225

upgpkg: ghc 8.0.1-1

Added:
  ghc/trunk/ghc-rebuild-doc-index.hook
  ghc/trunk/ghc-register.hook
  ghc/trunk/ghc-unregister.hook
Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/print-provides-replaces.sh

----------------------------+
 PKGBUILD                   |   79 +++++++++++++++++++++++++------------------
 ghc-rebuild-doc-index.hook |   14 +++++++
 ghc-register.hook          |   12 ++++++
 ghc-unregister.hook        |   12 ++++++
 print-provides-replaces.sh |    2 -
 5 files changed, 84 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 12:36:49 UTC (rev 176224)
+++ PKGBUILD	2016-05-24 13:46:23 UTC (rev 176225)
@@ -12,7 +12,7 @@
 # grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
 
 pkgname=ghc
-pkgver=7.10.3
+pkgver=8.0.1
 pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
@@ -20,39 +20,40 @@
 license=('custom')
 depends=('perl' 'gmp' 'gcc' 'libffi')
 makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
-provides=('haskell-array=0.5.1.0'
-          'haskell-base=4.8.2.0'
-          'haskell-binary=0.7.5.0'
-          'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.10.6.0'
-          'haskell-cabal=1.22.5.0'
-          'haskell-containers=0.5.6.2'
-          'haskell-deepseq=1.4.1.1'
-          'haskell-directory=1.2.2.0'
-          'haskell-filepath=1.4.0.0'
-          'haskell-ghc-prim=0.4.0.0'
-          'haskell-haskeline=0.7.2.1'
-          'haskell-hoopl=3.10.0.2'
-          'haskell-hpc=0.6.0.2'
-          'haskell-integer-gmp=1.0.0.0'
-          'haskell-pretty=1.1.2.0'
-          'haskell-process=1.2.3.0'
-          'haskell-template-haskell=2.10.0.0'
-          'haskell-terminfo=0.4.0.1'
-          'haskell-time=1.5.0.1'
-          'haskell-transformers=0.4.2.0'
-          'haskell-unix=2.7.1.0'
-          'haskell-xhtml=3000.2.1')
+provides=('haskell-array=0.5.1.1'
+          'haskell-base=4.9.0.0'
+          'haskell-binary=0.8.3.0'
+          'haskell-bytestring=0.10.8.1'
+          'haskell-containers=0.5.7.1'
+          'haskell-deepseq=1.4.2.0'
+          'haskell-directory=1.2.6.2'
+          'haskell-filepath=1.4.1.0'
+          'haskell-ghc-boot=8.0.1'
+          'haskell-ghc-boot-th=8.0.1'
+          'haskell-ghc-prim=0.5.0.0'
+          'haskell-haskeline=0.7.2.3'
+          'haskell-hoopl=3.10.2.1'
+          'haskell-hpc=0.6.0.3'
+          'haskell-integer-gmp=1.0.0.1'
+          'haskell-pretty=1.1.3.3'
+          'haskell-process=1.4.2.0'
+          'haskell-template-haskell=2.11.0.0'
+          'haskell-terminfo=0.4.0.2'
+          'haskell-time=1.6.0.1'
+          'haskell-transformers=0.5.2.0'
+          'haskell-unix=2.7.2.0'
+          'haskell-xhtml=3000.2.1'
+          'haskell-cabal=1.24.0.0')
 replaces=('haskell-array'
           'haskell-base'
           'haskell-binary'
-          'haskell-bin-package-db'
           'haskell-bytestring'
-          'haskell-cabal'
           'haskell-containers'
           'haskell-deepseq'
           'haskell-directory'
           'haskell-filepath'
+          'haskell-ghc-boot'
+          'haskell-ghc-boot-th'
           'haskell-ghc-prim'
           'haskell-haskeline'
           'haskell-hoopl'
@@ -65,18 +66,22 @@
           'haskell-time'
           'haskell-transformers'
           'haskell-unix'
-          'haskell-xhtml')
+          'haskell-xhtml'
+          'haskell-cabal')
 install='ghc.install'
-options=('staticlibs')
-source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgname-$pkgver-src.tar.xz")
-noextract=("$pkgname-$pkgver-src.tar.xz")
-md5sums=('00104e629bfda9f956c23752b5f38613')
+source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgname-${pkgver}-src.tar.xz"
+        ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook)
+noextract=("$pkgname-${pkgver}-src.tar.xz")
+md5sums=('c185b8a1f3e67e43533ec590b751c2ff'
+         'cc9aa11fddde15d8e5e15e99748874a1'
+         '20cc84d8058f385fec3c0068e369f1ef'
+         'f69583eedff4ad6dedbb7180a9525332')
 
 prepare() {
   # Need to extract this tarball with a UTF-8 locale instead of a chroot's "C"
   # locale; otherwise we get:
   #   bsdtar: Pathname can't be converted from UTF-8 to current locale.
-  LANG=en_US.UTF-8 bsdtar xf $pkgname-$pkgver-src.tar.xz
+  LANG=en_US.UTF-8 bsdtar xf $pkgname-${pkgver}-src.tar.xz
 
   cd ghc-$pkgver
 
@@ -91,6 +96,7 @@
 
   ./configure \
     --prefix=/usr \
+    --docdir=/usr/share/doc/ghc \
     --with-system-libffi \
     --with-ffi-includes=$(pkg-config --variable=includedir libffi)
   make
@@ -99,10 +105,17 @@
 package() {
   cd ghc-$pkgver
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -j1 install
 
   install -Dm644 utils/completion/ghc.bash \
     "$pkgdir/usr/share/bash-completion/completions/ghc"
 
+  for _hook in ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook; do
+    install -D -m644 "$srcdir/$_hook" \
+      "$pkgdir/usr/share/libalpm/hooks/$_hook"
+  done
+
+  install -d -m755 "${pkgdir}"/usr/share/haskell/{register,unregister}
+
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

Added: ghc-rebuild-doc-index.hook
===================================================================
--- ghc-rebuild-doc-index.hook	                        (rev 0)
+++ ghc-rebuild-doc-index.hook	2016-05-24 13:46:23 UTC (rev 176225)
@@ -0,0 +1,14 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/doc/ghc/html/libraries/*
+Target = !usr/share/doc/ghc/html/libraries/index.html
+
+[Action]
+Description = Rebuilding Haskell doc index...
+When = PostTransaction
+Exec = /bin/bash -c "cd /usr/share/doc/ghc/html/libraries && ./gen_contents_index"
+Depends = ghc
+Depends = bash

Added: ghc-register.hook
===================================================================
--- ghc-register.hook	                        (rev 0)
+++ ghc-register.hook	2016-05-24 13:46:23 UTC (rev 176225)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/share/haskell/register/*.sh
+
+[Action]
+Description = Registering Haskell modules...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" ; done'
+Depends = ghc
+NeedsTargets

Added: ghc-unregister.hook
===================================================================
--- ghc-unregister.hook	                        (rev 0)
+++ ghc-unregister.hook	2016-05-24 13:46:23 UTC (rev 176225)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/haskell/unregister/*.sh
+
+[Action]
+Description = Unregistering Haskell modules...
+When = PreTransaction
+Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" ; done'
+Depends = ghc
+NeedsTargets

Modified: print-provides-replaces.sh
===================================================================
--- print-provides-replaces.sh	2016-05-24 12:36:49 UTC (rev 176224)
+++ print-provides-replaces.sh	2016-05-24 13:46:23 UTC (rev 176225)
@@ -12,8 +12,6 @@
 exclude['Win32']=1
 # no integer-simple because we use integer-gmp
 exclude['integer-simple']=1
-# integer-gmp was replaced with integer-gmp2
-exclude['integer-gmp']=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



More information about the arch-commits mailing list