[arch-commits] Commit in ghc/repos (26 files)
Felix Yan
felixonmars at archlinux.org
Sat Jul 15 16:19:10 UTC 2017
Date: Saturday, July 15, 2017 @ 16:19:09
Author: felixonmars
Revision: 245244
archrelease: copy trunk to community-i686, community-x86_64
Added:
ghc/repos/community-i686/MADV_FREE.patch
(from rev 245243, ghc/trunk/MADV_FREE.patch)
ghc/repos/community-i686/PKGBUILD
(from rev 245243, ghc/trunk/PKGBUILD)
ghc/repos/community-i686/ghc-rebuild-doc-index.hook
(from rev 245243, ghc/trunk/ghc-rebuild-doc-index.hook)
ghc/repos/community-i686/ghc-register.hook
(from rev 245243, ghc/trunk/ghc-register.hook)
ghc/repos/community-i686/ghc-unregister.hook
(from rev 245243, ghc/trunk/ghc-unregister.hook)
ghc/repos/community-i686/ghc.install
(from rev 245243, ghc/trunk/ghc.install)
ghc/repos/community-i686/print-provides-replaces.sh
(from rev 245243, ghc/trunk/print-provides-replaces.sh)
ghc/repos/community-x86_64/MADV_FREE.patch
(from rev 245243, ghc/trunk/MADV_FREE.patch)
ghc/repos/community-x86_64/PKGBUILD
(from rev 245243, ghc/trunk/PKGBUILD)
ghc/repos/community-x86_64/ghc-rebuild-doc-index.hook
(from rev 245243, ghc/trunk/ghc-rebuild-doc-index.hook)
ghc/repos/community-x86_64/ghc-register.hook
(from rev 245243, ghc/trunk/ghc-register.hook)
ghc/repos/community-x86_64/ghc-unregister.hook
(from rev 245243, ghc/trunk/ghc-unregister.hook)
ghc/repos/community-x86_64/ghc.install
(from rev 245243, ghc/trunk/ghc.install)
ghc/repos/community-x86_64/print-provides-replaces.sh
(from rev 245243, ghc/trunk/print-provides-replaces.sh)
Deleted:
ghc/repos/community-i686/PKGBUILD
ghc/repos/community-i686/ghc-rebuild-doc-index.hook
ghc/repos/community-i686/ghc-register.hook
ghc/repos/community-i686/ghc-unregister.hook
ghc/repos/community-i686/ghc.install
ghc/repos/community-i686/print-provides-replaces.sh
ghc/repos/community-x86_64/PKGBUILD
ghc/repos/community-x86_64/ghc-rebuild-doc-index.hook
ghc/repos/community-x86_64/ghc-register.hook
ghc/repos/community-x86_64/ghc-unregister.hook
ghc/repos/community-x86_64/ghc.install
ghc/repos/community-x86_64/print-provides-replaces.sh
---------------------------------------------+
/PKGBUILD | 292 ++++++++++++++++++++++++++
/ghc-rebuild-doc-index.hook | 28 ++
/ghc-register.hook | 24 ++
/ghc-unregister.hook | 24 ++
/ghc.install | 20 +
/print-provides-replaces.sh | 90 ++++++++
community-i686/MADV_FREE.patch | 63 +++++
community-i686/PKGBUILD | 143 ------------
community-i686/ghc-rebuild-doc-index.hook | 14 -
community-i686/ghc-register.hook | 12 -
community-i686/ghc-unregister.hook | 12 -
community-i686/ghc.install | 10
community-i686/print-provides-replaces.sh | 45 ----
community-x86_64/MADV_FREE.patch | 63 +++++
community-x86_64/PKGBUILD | 143 ------------
community-x86_64/ghc-rebuild-doc-index.hook | 14 -
community-x86_64/ghc-register.hook | 12 -
community-x86_64/ghc-unregister.hook | 12 -
community-x86_64/ghc.install | 10
community-x86_64/print-provides-replaces.sh | 45 ----
20 files changed, 604 insertions(+), 472 deletions(-)
Copied: ghc/repos/community-i686/MADV_FREE.patch (from rev 245243, ghc/trunk/MADV_FREE.patch)
===================================================================
--- community-i686/MADV_FREE.patch (rev 0)
+++ community-i686/MADV_FREE.patch 2017-07-15 16:19:09 UTC (rev 245244)
@@ -0,0 +1,63 @@
+From 6576bf83cdf4eac05eb88a24aa934a736c91e3da Mon Sep 17 00:00:00 2001
+From: Ben Gamari <bgamari.foss at gmail.com>
+Date: Thu, 1 Dec 2016 12:55:23 -0500
+Subject: [PATCH] rts: Ensure we always give MADV_DONTNEED a chance in
+ osDecommitMemory
+
+As described in #12865, newer Linux kernels support both MADV_FREE and
+MADV_DONTNEED. Previously a runtime would fail to try MADV_DONTNEED if
+MADV_FREE failed (e.g. since the kernel which the image is running on
+doesn't support the latter). Now we try MADV_DONTNEED if MADV_FREE
+failed to ensure that binaries compiled on a kernel supporting MADV_FREE
+don't fail on decommit.
+
+Test Plan: Validate
+
+Reviewers: austin, erikd, simonmar
+
+Reviewed By: simonmar
+
+Subscribers: thomie
+
+Differential Revision: https://phabricator.haskell.org/D2780
+
+GHC Trac Issues: #12865
+---
+ rts/posix/OSMem.c | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
+index 5291745..beffeda 100644
+--- a/rts/posix/OSMem.c
++++ b/rts/posix/OSMem.c
+@@ -541,11 +541,24 @@ void osDecommitMemory(void *at, W_ size)
+
+ #ifdef MADV_FREE
+ // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED
+- // just swaps memory out
++ // just swaps memory out. Linux >= 4.5 has both DONTNEED and FREE; either
++ // will work as they both allow the system to free anonymous pages.
++ // It is important that we try both methods as the kernel which we were
++ // built on may differ from the kernel we are now running on.
+ r = madvise(at, size, MADV_FREE);
+-#else
+- r = madvise(at, size, MADV_DONTNEED);
++ if(r < 0) {
++ if (errno == EINVAL) {
++ // Perhaps the system doesn't support MADV_FREE; fall-through and
++ // try MADV_DONTNEED.
++ } else {
++ sysErrorBelch("unable to decommit memory");
++ }
++ } else {
++ return;
++ }
+ #endif
++
++ r = madvise(at, size, MADV_DONTNEED);
+ if(r < 0)
+ sysErrorBelch("unable to decommit memory");
+ }
+--
+1.9.1
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-i686/PKGBUILD 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,143 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Vesa Kaihlavirta <vesa at archlinux.org>
-# Contributor: Thomas Dziedzic <gostrc at gmail.com>
-
-# 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.
-
-# use the following command to print out packages that need to get rebuilt
-# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
-
-pkgbase=ghc
-pkgname=(ghc ghc-static)
-pkgver=8.0.2
-pkgrel=2
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-makedepends=('ghc-static' '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=('d0afb5ec441b14527a53d2445cc26ec3'
- 'cc9aa11fddde15d8e5e15e99748874a1'
- '3b1949e77038b0276ebd5590ab89e1af'
- '587efb0cb73a6b336cd9333fc5697de4')
-
-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
-
- cd ghc-$pkgver
-
- cp mk/build.mk{.sample,}
- sed -i '1iBuildFlavour = perf' mk/build.mk
-}
-
-build() {
- cd ghc-$pkgver
-
- ./configure \
- --prefix=/usr \
- --docdir=/usr/share/doc/ghc \
- --with-system-libffi \
- --with-ffi-includes=$(pkg-config --variable=includedir libffi)
- make
-}
-
-package_ghc-static() {
- pkgdesc='The Glasgow Haskell Compiler - Static Libraries'
- depends=('ghc')
-
- cd ghc-$pkgver
-
- make DESTDIR="$pkgdir" -j1 install
-
- mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d
- find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.p_hi" \) -type f -delete
- find "$pkgdir"/usr/lib -type d -empty -delete
- mv "$srcdir"/static-package.conf.d "$pkgdir"/usr/lib/ghc-$pkgver/
- 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"
- done
-
- 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" -o -name "*.p_hi" \) -delete
-
- install -Dm644 utils/completion/ghc.bash \
- "$pkgdir/usr/share/bash-completion/completions/ghc"
-}
Copied: ghc/repos/community-i686/PKGBUILD (from rev 245243, ghc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-07-15 16:19:09 UTC (rev 245244)
@@ -0,0 +1,146 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vesa at archlinux.org>
+# Contributor: Thomas Dziedzic <gostrc at gmail.com>
+
+# 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.
+
+# use the following command to print out packages that need to get rebuilt
+# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
+
+pkgbase=ghc
+pkgname=(ghc ghc-static)
+pkgver=8.0.2
+pkgrel=3
+pkgdesc='The Glasgow Haskell Compiler'
+arch=('i686' 'x86_64')
+url='http://www.haskell.org/ghc/'
+license=('custom')
+makedepends=('ghc-static' '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 MADV_FREE.patch)
+noextract=("$pkgname-${pkgver}-src.tar.xz")
+md5sums=('d0afb5ec441b14527a53d2445cc26ec3'
+ 'cc9aa11fddde15d8e5e15e99748874a1'
+ '3b1949e77038b0276ebd5590ab89e1af'
+ '587efb0cb73a6b336cd9333fc5697de4'
+ '3bf341c04e2e501a5ace07127de23e8f')
+
+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
+
+ cd ghc-$pkgver
+ # FS#54823
+ patch -p1 -i ../MADV_FREE.patch
+
+ cp mk/build.mk{.sample,}
+ sed -i '1iBuildFlavour = perf' mk/build.mk
+}
+
+build() {
+ cd ghc-$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --docdir=/usr/share/doc/ghc \
+ --with-system-libffi \
+ --with-ffi-includes=$(pkg-config --variable=includedir libffi)
+ make
+}
+
+package_ghc-static() {
+ pkgdesc='The Glasgow Haskell Compiler - Static Libraries'
+ depends=('ghc')
+
+ cd ghc-$pkgver
+
+ make DESTDIR="$pkgdir" -j1 install
+
+ mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d
+ find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.p_hi" \) -type f -delete
+ find "$pkgdir"/usr/lib -type d -empty -delete
+ mv "$srcdir"/static-package.conf.d "$pkgdir"/usr/lib/ghc-$pkgver/
+ 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"
+ done
+
+ install -d -m755 "${pkgdir}"/usr/share/haskell/{register,unregister}
+
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # Remove static libs
+ find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
+
+ install -Dm644 utils/completion/ghc.bash \
+ "$pkgdir/usr/share/bash-completion/completions/ghc"
+}
Deleted: community-i686/ghc-rebuild-doc-index.hook
===================================================================
--- community-i686/ghc-rebuild-doc-index.hook 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-i686/ghc-rebuild-doc-index.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,14 +0,0 @@
-[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
Copied: ghc/repos/community-i686/ghc-rebuild-doc-index.hook (from rev 245243, ghc/trunk/ghc-rebuild-doc-index.hook)
===================================================================
--- community-i686/ghc-rebuild-doc-index.hook (rev 0)
+++ community-i686/ghc-rebuild-doc-index.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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
Deleted: community-i686/ghc-register.hook
===================================================================
--- community-i686/ghc-register.hook 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-i686/ghc-register.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,12 +0,0 @@
-[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" 2>&1 >/dev/null ; done'
-Depends = ghc
-NeedsTargets
Copied: ghc/repos/community-i686/ghc-register.hook (from rev 245243, ghc/trunk/ghc-register.hook)
===================================================================
--- community-i686/ghc-register.hook (rev 0)
+++ community-i686/ghc-register.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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" 2>&1 >/dev/null ; done'
+Depends = ghc
+NeedsTargets
Deleted: community-i686/ghc-unregister.hook
===================================================================
--- community-i686/ghc-unregister.hook 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-i686/ghc-unregister.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,12 +0,0 @@
-[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" 2>&1 >/dev/null ; done'
-Depends = ghc
-NeedsTargets
Copied: ghc/repos/community-i686/ghc-unregister.hook (from rev 245243, ghc/trunk/ghc-unregister.hook)
===================================================================
--- community-i686/ghc-unregister.hook (rev 0)
+++ community-i686/ghc-unregister.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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" 2>&1 >/dev/null ; done'
+Depends = ghc
+NeedsTargets
Deleted: community-i686/ghc.install
===================================================================
--- community-i686/ghc.install 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-i686/ghc.install 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,10 +0,0 @@
-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/ for a tentative list of affected packages.'
-}
Copied: ghc/repos/community-i686/ghc.install (from rev 245243, ghc/trunk/ghc.install)
===================================================================
--- community-i686/ghc.install (rev 0)
+++ community-i686/ghc.install 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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/ for a tentative list of affected packages.'
+}
Deleted: community-i686/print-provides-replaces.sh
===================================================================
--- community-i686/print-provides-replaces.sh 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-i686/print-provides-replaces.sh 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,45 +0,0 @@
-#!/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 path in $(ls ./*/*.cabal); do
- dirname=$(echo $path | awk -F '/' '{ print $2 }')
- cabalfile=$(echo $path | awk -F '/' '{ print $3 }')
- cabalname=$(basename $cabalfile .cabal)
- [[ ${exclude[${dirname}]} ]] && continue
- version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path)
- printf "'haskell-$cabalname"
- [[ -n "$2" ]] && printf "$2$version"
- printf "'\n "
- done
- # also add cabal
- version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
- printf "'haskell-cabal"
- [[ -n "$2" ]] && printf "$2$version"
- printf "'\n "
- echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces'
Copied: ghc/repos/community-i686/print-provides-replaces.sh (from rev 245243, ghc/trunk/print-provides-replaces.sh)
===================================================================
--- community-i686/print-provides-replaces.sh (rev 0)
+++ community-i686/print-provides-replaces.sh 2017-07-15 16:19:09 UTC (rev 245244)
@@ -0,0 +1,45 @@
+#!/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 path in $(ls ./*/*.cabal); do
+ dirname=$(echo $path | awk -F '/' '{ print $2 }')
+ cabalfile=$(echo $path | awk -F '/' '{ print $3 }')
+ cabalname=$(basename $cabalfile .cabal)
+ [[ ${exclude[${dirname}]} ]] && continue
+ version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path)
+ printf "'haskell-$cabalname"
+ [[ -n "$2" ]] && printf "$2$version"
+ printf "'\n "
+ done
+ # also add cabal
+ version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
+ printf "'haskell-cabal"
+ [[ -n "$2" ]] && printf "$2$version"
+ printf "'\n "
+ echo -e '\b)'
+}
+
+print_var 'provides' '='
+print_var 'replaces'
Copied: ghc/repos/community-x86_64/MADV_FREE.patch (from rev 245243, ghc/trunk/MADV_FREE.patch)
===================================================================
--- community-x86_64/MADV_FREE.patch (rev 0)
+++ community-x86_64/MADV_FREE.patch 2017-07-15 16:19:09 UTC (rev 245244)
@@ -0,0 +1,63 @@
+From 6576bf83cdf4eac05eb88a24aa934a736c91e3da Mon Sep 17 00:00:00 2001
+From: Ben Gamari <bgamari.foss at gmail.com>
+Date: Thu, 1 Dec 2016 12:55:23 -0500
+Subject: [PATCH] rts: Ensure we always give MADV_DONTNEED a chance in
+ osDecommitMemory
+
+As described in #12865, newer Linux kernels support both MADV_FREE and
+MADV_DONTNEED. Previously a runtime would fail to try MADV_DONTNEED if
+MADV_FREE failed (e.g. since the kernel which the image is running on
+doesn't support the latter). Now we try MADV_DONTNEED if MADV_FREE
+failed to ensure that binaries compiled on a kernel supporting MADV_FREE
+don't fail on decommit.
+
+Test Plan: Validate
+
+Reviewers: austin, erikd, simonmar
+
+Reviewed By: simonmar
+
+Subscribers: thomie
+
+Differential Revision: https://phabricator.haskell.org/D2780
+
+GHC Trac Issues: #12865
+---
+ rts/posix/OSMem.c | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
+index 5291745..beffeda 100644
+--- a/rts/posix/OSMem.c
++++ b/rts/posix/OSMem.c
+@@ -541,11 +541,24 @@ void osDecommitMemory(void *at, W_ size)
+
+ #ifdef MADV_FREE
+ // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED
+- // just swaps memory out
++ // just swaps memory out. Linux >= 4.5 has both DONTNEED and FREE; either
++ // will work as they both allow the system to free anonymous pages.
++ // It is important that we try both methods as the kernel which we were
++ // built on may differ from the kernel we are now running on.
+ r = madvise(at, size, MADV_FREE);
+-#else
+- r = madvise(at, size, MADV_DONTNEED);
++ if(r < 0) {
++ if (errno == EINVAL) {
++ // Perhaps the system doesn't support MADV_FREE; fall-through and
++ // try MADV_DONTNEED.
++ } else {
++ sysErrorBelch("unable to decommit memory");
++ }
++ } else {
++ return;
++ }
+ #endif
++
++ r = madvise(at, size, MADV_DONTNEED);
+ if(r < 0)
+ sysErrorBelch("unable to decommit memory");
+ }
+--
+1.9.1
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-x86_64/PKGBUILD 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,143 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Vesa Kaihlavirta <vesa at archlinux.org>
-# Contributor: Thomas Dziedzic <gostrc at gmail.com>
-
-# 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.
-
-# use the following command to print out packages that need to get rebuilt
-# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
-
-pkgbase=ghc
-pkgname=(ghc ghc-static)
-pkgver=8.0.2
-pkgrel=2
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-makedepends=('ghc-static' '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=('d0afb5ec441b14527a53d2445cc26ec3'
- 'cc9aa11fddde15d8e5e15e99748874a1'
- '3b1949e77038b0276ebd5590ab89e1af'
- '587efb0cb73a6b336cd9333fc5697de4')
-
-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
-
- cd ghc-$pkgver
-
- cp mk/build.mk{.sample,}
- sed -i '1iBuildFlavour = perf' mk/build.mk
-}
-
-build() {
- cd ghc-$pkgver
-
- ./configure \
- --prefix=/usr \
- --docdir=/usr/share/doc/ghc \
- --with-system-libffi \
- --with-ffi-includes=$(pkg-config --variable=includedir libffi)
- make
-}
-
-package_ghc-static() {
- pkgdesc='The Glasgow Haskell Compiler - Static Libraries'
- depends=('ghc')
-
- cd ghc-$pkgver
-
- make DESTDIR="$pkgdir" -j1 install
-
- mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d
- find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.p_hi" \) -type f -delete
- find "$pkgdir"/usr/lib -type d -empty -delete
- mv "$srcdir"/static-package.conf.d "$pkgdir"/usr/lib/ghc-$pkgver/
- 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"
- done
-
- 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" -o -name "*.p_hi" \) -delete
-
- install -Dm644 utils/completion/ghc.bash \
- "$pkgdir/usr/share/bash-completion/completions/ghc"
-}
Copied: ghc/repos/community-x86_64/PKGBUILD (from rev 245243, ghc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-07-15 16:19:09 UTC (rev 245244)
@@ -0,0 +1,146 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vesa at archlinux.org>
+# Contributor: Thomas Dziedzic <gostrc at gmail.com>
+
+# 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.
+
+# use the following command to print out packages that need to get rebuilt
+# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
+
+pkgbase=ghc
+pkgname=(ghc ghc-static)
+pkgver=8.0.2
+pkgrel=3
+pkgdesc='The Glasgow Haskell Compiler'
+arch=('i686' 'x86_64')
+url='http://www.haskell.org/ghc/'
+license=('custom')
+makedepends=('ghc-static' '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 MADV_FREE.patch)
+noextract=("$pkgname-${pkgver}-src.tar.xz")
+md5sums=('d0afb5ec441b14527a53d2445cc26ec3'
+ 'cc9aa11fddde15d8e5e15e99748874a1'
+ '3b1949e77038b0276ebd5590ab89e1af'
+ '587efb0cb73a6b336cd9333fc5697de4'
+ '3bf341c04e2e501a5ace07127de23e8f')
+
+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
+
+ cd ghc-$pkgver
+ # FS#54823
+ patch -p1 -i ../MADV_FREE.patch
+
+ cp mk/build.mk{.sample,}
+ sed -i '1iBuildFlavour = perf' mk/build.mk
+}
+
+build() {
+ cd ghc-$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --docdir=/usr/share/doc/ghc \
+ --with-system-libffi \
+ --with-ffi-includes=$(pkg-config --variable=includedir libffi)
+ make
+}
+
+package_ghc-static() {
+ pkgdesc='The Glasgow Haskell Compiler - Static Libraries'
+ depends=('ghc')
+
+ cd ghc-$pkgver
+
+ make DESTDIR="$pkgdir" -j1 install
+
+ mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d
+ find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.p_hi" \) -type f -delete
+ find "$pkgdir"/usr/lib -type d -empty -delete
+ mv "$srcdir"/static-package.conf.d "$pkgdir"/usr/lib/ghc-$pkgver/
+ 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"
+ done
+
+ install -d -m755 "${pkgdir}"/usr/share/haskell/{register,unregister}
+
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # Remove static libs
+ find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
+
+ install -Dm644 utils/completion/ghc.bash \
+ "$pkgdir/usr/share/bash-completion/completions/ghc"
+}
Deleted: community-x86_64/ghc-rebuild-doc-index.hook
===================================================================
--- community-x86_64/ghc-rebuild-doc-index.hook 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-x86_64/ghc-rebuild-doc-index.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,14 +0,0 @@
-[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
Copied: ghc/repos/community-x86_64/ghc-rebuild-doc-index.hook (from rev 245243, ghc/trunk/ghc-rebuild-doc-index.hook)
===================================================================
--- community-x86_64/ghc-rebuild-doc-index.hook (rev 0)
+++ community-x86_64/ghc-rebuild-doc-index.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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
Deleted: community-x86_64/ghc-register.hook
===================================================================
--- community-x86_64/ghc-register.hook 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-x86_64/ghc-register.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,12 +0,0 @@
-[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" 2>&1 >/dev/null ; done'
-Depends = ghc
-NeedsTargets
Copied: ghc/repos/community-x86_64/ghc-register.hook (from rev 245243, ghc/trunk/ghc-register.hook)
===================================================================
--- community-x86_64/ghc-register.hook (rev 0)
+++ community-x86_64/ghc-register.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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" 2>&1 >/dev/null ; done'
+Depends = ghc
+NeedsTargets
Deleted: community-x86_64/ghc-unregister.hook
===================================================================
--- community-x86_64/ghc-unregister.hook 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-x86_64/ghc-unregister.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,12 +0,0 @@
-[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" 2>&1 >/dev/null ; done'
-Depends = ghc
-NeedsTargets
Copied: ghc/repos/community-x86_64/ghc-unregister.hook (from rev 245243, ghc/trunk/ghc-unregister.hook)
===================================================================
--- community-x86_64/ghc-unregister.hook (rev 0)
+++ community-x86_64/ghc-unregister.hook 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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" 2>&1 >/dev/null ; done'
+Depends = ghc
+NeedsTargets
Deleted: community-x86_64/ghc.install
===================================================================
--- community-x86_64/ghc.install 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-x86_64/ghc.install 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,10 +0,0 @@
-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/ for a tentative list of affected packages.'
-}
Copied: ghc/repos/community-x86_64/ghc.install (from rev 245243, ghc/trunk/ghc.install)
===================================================================
--- community-x86_64/ghc.install (rev 0)
+++ community-x86_64/ghc.install 2017-07-15 16:19:09 UTC (rev 245244)
@@ -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/ for a tentative list of affected packages.'
+}
Deleted: community-x86_64/print-provides-replaces.sh
===================================================================
--- community-x86_64/print-provides-replaces.sh 2017-07-15 16:18:08 UTC (rev 245243)
+++ community-x86_64/print-provides-replaces.sh 2017-07-15 16:19:09 UTC (rev 245244)
@@ -1,45 +0,0 @@
-#!/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 path in $(ls ./*/*.cabal); do
- dirname=$(echo $path | awk -F '/' '{ print $2 }')
- cabalfile=$(echo $path | awk -F '/' '{ print $3 }')
- cabalname=$(basename $cabalfile .cabal)
- [[ ${exclude[${dirname}]} ]] && continue
- version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path)
- printf "'haskell-$cabalname"
- [[ -n "$2" ]] && printf "$2$version"
- printf "'\n "
- done
- # also add cabal
- version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
- printf "'haskell-cabal"
- [[ -n "$2" ]] && printf "$2$version"
- printf "'\n "
- echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces'
Copied: ghc/repos/community-x86_64/print-provides-replaces.sh (from rev 245243, ghc/trunk/print-provides-replaces.sh)
===================================================================
--- community-x86_64/print-provides-replaces.sh (rev 0)
+++ community-x86_64/print-provides-replaces.sh 2017-07-15 16:19:09 UTC (rev 245244)
@@ -0,0 +1,45 @@
+#!/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 path in $(ls ./*/*.cabal); do
+ dirname=$(echo $path | awk -F '/' '{ print $2 }')
+ cabalfile=$(echo $path | awk -F '/' '{ print $3 }')
+ cabalname=$(basename $cabalfile .cabal)
+ [[ ${exclude[${dirname}]} ]] && continue
+ version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path)
+ printf "'haskell-$cabalname"
+ [[ -n "$2" ]] && printf "$2$version"
+ printf "'\n "
+ done
+ # also add cabal
+ version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
+ printf "'haskell-cabal"
+ [[ -n "$2" ]] && printf "$2$version"
+ printf "'\n "
+ echo -e '\b)'
+}
+
+print_var 'provides' '='
+print_var 'replaces'
More information about the arch-commits
mailing list