[arch-commits] Commit in ghc/trunk (5 files)
Felix Yan
felixonmars at archlinux.org
Mon Aug 14 17:43:19 UTC 2017
Date: Monday, August 14, 2017 @ 17:43:19
Author: felixonmars
Revision: 250403
upgpkg: ghc 8.2.1-1
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/ghc-rebuild-doc-index.hook
ghc/trunk/ghc-register.hook
ghc/trunk/ghc-unregister.hook
Deleted:
ghc/trunk/MADV_FREE.patch
----------------------------+
MADV_FREE.patch | 63 --------------------
PKGBUILD | 133 +++++++++++++++++++++++++------------------
ghc-rebuild-doc-index.hook | 2
ghc-register.hook | 2
ghc-unregister.hook | 2
5 files changed, 83 insertions(+), 119 deletions(-)
Deleted: MADV_FREE.patch
===================================================================
--- MADV_FREE.patch 2017-08-14 16:04:49 UTC (rev 250402)
+++ MADV_FREE.patch 2017-08-14 17:43:19 UTC (rev 250403)
@@ -1,63 +0,0 @@
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-08-14 16:04:49 UTC (rev 250402)
+++ PKGBUILD 2017-08-14 17:43:19 UTC (rev 250403)
@@ -8,13 +8,12 @@
# 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
+shopt -s extglob
pkgbase=ghc
-pkgname=(ghc ghc-static)
-pkgver=8.0.2
-pkgrel=3
+pkgname=(ghc-libs ghc ghc-static)
+pkgver=8.2.1
+pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
url='http://www.haskell.org/ghc/'
@@ -21,24 +20,21 @@
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')
+source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgbase-${pkgver}-src.tar.xz"
+ ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook)
+noextract=("$pkgbase-${pkgver}-src.tar.xz")
+md5sums=('8942b6fb393984aeb8304d09bc326851'
+ '4966d798a2868b289022aea8b655bf17'
+ '700bcd96afd059d668e50b51c19650d5'
+ '2355771881c91cb46e6249a81352aea2')
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 $pkgbase-${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
@@ -56,48 +52,76 @@
}
package_ghc-static() {
- pkgdesc='The Glasgow Haskell Compiler - Static Libraries'
+ pkgdesc='The Glasgow Haskell Compiler - Static Libraries and Documentation'
depends=('ghc')
cd ghc-$pkgver
- make DESTDIR="$pkgdir" -j1 install
+ make DESTDIR="$pkgdir" 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
+ rm -r "$pkgdir"/usr/bin "$pkgdir"/usr/share/man
+
+ install -Dm644 "$srcdir"/ghc-rebuild-doc-index.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-rebuild-doc-index.hook
}
package_ghc() {
pkgdesc='The Glasgow Haskell Compiler'
+ provides=("haskell-ghc=$pkgver")
+ replaces=("haskell-ghc")
+ depends=('ghc-libs')
+
+ cd ghc-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # Remove static libs
+ find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
+
+ # ghc-pkg is in ghc-libs
+ rm "$pkgdir"/usr/lib/ghc-$pkgver/bin/ghc-pkg*
+ rm "$pkgdir"/usr/bin/ghc-pkg*
+ (cd "$pkgdir"/usr/lib/ghc-$pkgver; rm -r !(bin|ghc-$pkgver))
+
+ # docs moved to ghc-static
+ rm -r "$pkgdir"/usr/share/doc
+
+ install -Dm644 utils/completion/ghc.bash \
+ "$pkgdir/usr/share/bash-completion/completions/ghc"
+}
+
+package_ghc-libs() {
+ pkgdesc='The Glasgow Haskell Compiler - Dynamic Libraries'
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'
+ provides=('haskell-array=0.5.2.0'
+ 'haskell-base=4.10.0.0'
+ 'haskell-binary=0.8.5.1'
+ 'haskell-bytestring=0.10.8.2'
+ 'haskell-containers=0.5.10.2'
+ 'haskell-deepseq=1.4.3.0'
+ 'haskell-directory=1.3.0.2'
+ 'haskell-filepath=1.4.1.2'
+ 'haskell-ghc-boot=8.2.1'
+ 'haskell-ghc-boot-th=8.2.1'
+ 'haskell-ghc-compact=0.1.0.0'
+ 'haskell-ghci=8.2.1'
+ 'haskell-ghc-prim=0.5.1.0'
+ 'haskell-haskeline=0.7.4.0'
+ 'haskell-hoopl=3.10.2.2'
'haskell-hpc=0.6.0.3'
- 'haskell-integer-gmp=1.0.0.1'
+ 'haskell-integer-gmp=1.0.1.0'
'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-process=1.6.1.0'
+ 'haskell-template-haskell=2.12.0.0'
+ 'haskell-terminfo=0.4.1.0'
+ 'haskell-time=1.8.0.2'
'haskell-transformers=0.5.2.0'
- 'haskell-unix=2.7.2.1'
- 'haskell-xhtml=3000.2.1'
- 'haskell-cabal=1.24.2.0')
+ 'haskell-unix=2.7.2.2'
+ 'haskell-xhtml=3000.2.2'
+ 'haskell-cabal=2.0.0.2')
replaces=('haskell-array'
'haskell-base'
'haskell-binary'
@@ -108,6 +132,8 @@
'haskell-filepath'
'haskell-ghc-boot'
'haskell-ghc-boot-th'
+ 'haskell-ghc-compact'
+ 'haskell-ghci'
'haskell-ghc-prim'
'haskell-haskeline'
'haskell-hoopl'
@@ -122,25 +148,26 @@
'haskell-unix'
'haskell-xhtml'
'haskell-cabal')
- provides+=("haskell-ghc=$pkgver")
- replaces+=("haskell-ghc")
cd ghc-$pkgver
- make DESTDIR="$pkgdir" -j1 install
+ make DESTDIR="$pkgdir" 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
+ # Remove static libs
+ find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
- install -d -m755 "${pkgdir}"/usr/share/haskell/{register,unregister}
+ # ghc library and other exes are in the ghc package
+ rm -r "$pkgdir"/usr/lib/ghc-$pkgver/ghc-$pkgver
+ (cd "$pkgdir"/usr/lib/ghc-$pkgver/bin; rm !(ghc-pkg*))
+ (cd "$pkgdir"/usr/bin; rm !(ghc-pkg*))
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ # docs moved to ghc-static
+ rm -r "$pkgdir"/usr/share/{man,doc}
- # Remove static libs
- find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
+ install -Dm644 "$srcdir"/ghc-register.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-register.hook
+ install -Dm644 "$srcdir"/ghc-unregister.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-unregister.hook
- install -Dm644 utils/completion/ghc.bash \
- "$pkgdir/usr/share/bash-completion/completions/ghc"
+ install -dm755 "$pkgdir"/usr/share/haskell/{register,unregister}
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
Modified: ghc-rebuild-doc-index.hook
===================================================================
--- ghc-rebuild-doc-index.hook 2017-08-14 16:04:49 UTC (rev 250402)
+++ ghc-rebuild-doc-index.hook 2017-08-14 17:43:19 UTC (rev 250403)
@@ -10,5 +10,5 @@
Description = Rebuilding Haskell doc index...
When = PostTransaction
Exec = /bin/bash -c "cd /usr/share/doc/ghc/html/libraries && ./gen_contents_index"
-Depends = ghc
+Depends = ghc-static
Depends = bash
Modified: ghc-register.hook
===================================================================
--- ghc-register.hook 2017-08-14 16:04:49 UTC (rev 250402)
+++ ghc-register.hook 2017-08-14 17:43:19 UTC (rev 250403)
@@ -8,5 +8,5 @@
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
+Depends = ghc-libs
NeedsTargets
Modified: ghc-unregister.hook
===================================================================
--- ghc-unregister.hook 2017-08-14 16:04:49 UTC (rev 250402)
+++ ghc-unregister.hook 2017-08-14 17:43:19 UTC (rev 250403)
@@ -8,5 +8,5 @@
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
+Depends = ghc-libs
NeedsTargets
More information about the arch-commits
mailing list