[arch-commits] Commit in ghc/trunk (PKGBUILD ghc-register.hook ghc-unregister.hook)

Felix Yan felixonmars at archlinux.org
Wed Jun 14 19:00:02 UTC 2017


    Date: Wednesday, June 14, 2017 @ 19:00:01
  Author: felixonmars
Revision: 236801

upgpkg: ghc 8.0.2-1

- Upstream new release
- Split static libraries, preparing for dynamic executables in all haskell packages

Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/ghc-register.hook
  ghc/trunk/ghc-unregister.hook

---------------------+
 PKGBUILD            |  144 ++++++++++++++++++++++++++++----------------------
 ghc-register.hook   |    2 
 ghc-unregister.hook |    2 
 3 files changed, 85 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-14 18:34:40 UTC (rev 236800)
+++ PKGBUILD	2017-06-14 19:00:01 UTC (rev 236801)
@@ -11,71 +11,23 @@
 # use the following command to print out packages that need to get rebuilt
 # grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
 
-pkgname=ghc
-pkgver=8.0.1
+pkgbase=ghc
+pkgname=(ghc ghc-static)
+pkgver=8.0.2
 pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
 license=('custom')
-depends=('perl' 'gmp' 'gcc' 'libffi')
-makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
-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-bytestring'
-          'haskell-containers'
-          'haskell-deepseq'
-          'haskell-directory'
-          'haskell-filepath'
-          'haskell-ghc-boot'
-          'haskell-ghc-boot-th'
-          'haskell-ghc-prim'
-          'haskell-haskeline'
-          'haskell-hoopl'
-          'haskell-hpc'
-          'haskell-integer-gmp'
-          'haskell-pretty'
-          'haskell-process'
-          'haskell-template-haskell'
-          'haskell-terminfo'
-          'haskell-time'
-          'haskell-transformers'
-          'haskell-unix'
-          'haskell-xhtml'
-          'haskell-cabal')
-install='ghc.install'
+makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl' 'python-sphinx' 'haskell-hscolour'
+             'texlive-bin' 'texlive-latexextra' 'ttf-dejavu')
 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'
+md5sums=('d0afb5ec441b14527a53d2445cc26ec3'
          'cc9aa11fddde15d8e5e15e99748874a1'
-         '20cc84d8058f385fec3c0068e369f1ef'
-         'f69583eedff4ad6dedbb7180a9525332')
+         '3b1949e77038b0276ebd5590ab89e1af'
+         '587efb0cb73a6b336cd9333fc5697de4')
 
 prepare() {
   # Need to extract this tarball with a UTF-8 locale instead of a chroot's "C"
@@ -85,10 +37,10 @@
 
   cd ghc-$pkgver
 
-  # We select the following build profile:
-  #   Full build with max optimisation and everything enabled (very slow build)
+  # Disable profiling libraries since 8.0.2
   cp mk/build.mk{.sample,}
   sed -i '1iBuildFlavour = perf' mk/build.mk
+  sed -i 's/BUILD_PROF_LIBS    = YES/BUILD_PROF_LIBS    = NO/' mk/flavours/perf.mk
 }
 
 build() {
@@ -102,14 +54,78 @@
   make
 }
 
-package() {
+package_ghc-static() {
+  pkgdesc='The Glasgow Haskell Compiler - Static Libraries'
+  depends=('ghc')
+
   cd ghc-$pkgver
 
   make DESTDIR="$pkgdir" -j1 install
 
-  install -Dm644 utils/completion/ghc.bash \
-    "$pkgdir/usr/share/bash-completion/completions/ghc"
+  find "$pkgdir"/usr/lib ! -name "*.a" -type f -delete
+  find "$pkgdir"/usr/lib -type d -empty -delete
+  rm -r "$pkgdir"/usr/share "$pkgdir"/usr/bin
+}
 
+package_ghc() {
+  pkgdesc='The Glasgow Haskell Compiler'
+  install='ghc.install'
+  depends=('gcc' 'gmp' 'libffi' 'perl')
+  provides=('haskell-array=0.5.1.1'
+            'haskell-base=4.9.1.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.3.0.0'
+            'haskell-filepath=1.4.1.1'
+            'haskell-ghc-boot=8.0.2'
+            'haskell-ghc-boot-th=8.0.2'
+            'haskell-ghc-prim=0.5.0.0'
+            'haskell-haskeline=0.7.3.0'
+            '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.3.0'
+            'haskell-template-haskell=2.11.1.0'
+            'haskell-terminfo=0.4.0.2'
+            'haskell-time=1.6.0.1'
+            'haskell-transformers=0.5.2.0'
+            'haskell-unix=2.7.2.1'
+            'haskell-xhtml=3000.2.1'
+            'haskell-cabal=1.24.2.0')
+  replaces=('haskell-array'
+            'haskell-base'
+            'haskell-binary'
+            'haskell-bytestring'
+            'haskell-containers'
+            'haskell-deepseq'
+            'haskell-directory'
+            'haskell-filepath'
+            'haskell-ghc-boot'
+            'haskell-ghc-boot-th'
+            'haskell-ghc-prim'
+            'haskell-haskeline'
+            'haskell-hoopl'
+            'haskell-hpc'
+            'haskell-integer-gmp'
+            'haskell-pretty'
+            'haskell-process'
+            'haskell-template-haskell'
+            'haskell-terminfo'
+            'haskell-time'
+            'haskell-transformers'
+            'haskell-unix'
+            'haskell-xhtml'
+            'haskell-cabal')
+  provides+=("haskell-ghc=$pkgver")
+  replaces+=("haskell-ghc")
+
+  cd ghc-$pkgver
+
+  make DESTDIR="$pkgdir" -j1 install
+
   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"
@@ -118,4 +134,10 @@
   install -d -m755 "${pkgdir}"/usr/share/haskell/{register,unregister}
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Remove static libs and the compiler itself, but keep ghc-pkg for library (un)register
+  find "$pkgdir"/usr/lib -name "*.a" -delete
+
+  install -Dm644 utils/completion/ghc.bash \
+    "$pkgdir/usr/share/bash-completion/completions/ghc"
 }

Modified: ghc-register.hook
===================================================================
--- ghc-register.hook	2017-06-14 18:34:40 UTC (rev 236800)
+++ ghc-register.hook	2017-06-14 19:00:01 UTC (rev 236801)
@@ -7,6 +7,6 @@
 [Action]
 Description = Registering Haskell modules...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" ; done'
+Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" 2>&1 >/dev/null ; done'
 Depends = ghc
 NeedsTargets

Modified: ghc-unregister.hook
===================================================================
--- ghc-unregister.hook	2017-06-14 18:34:40 UTC (rev 236800)
+++ ghc-unregister.hook	2017-06-14 19:00:01 UTC (rev 236801)
@@ -7,6 +7,6 @@
 [Action]
 Description = Unregistering Haskell modules...
 When = PreTransaction
-Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" ; done'
+Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" 2>&1 >/dev/null ; done'
 Depends = ghc
 NeedsTargets



More information about the arch-commits mailing list