subject:"\[arch\-commits\] Commit in ghc\/trunk \(5 files\)"

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

2017-08-14 Thread Felix Yan

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 
-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
===
--- PKGBUILD2017-08-14 16:04:49 UTC (rev 250402)
+++ PKGBUILD2017-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

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

2016-05-24 Thread Felix Yan

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
===
--- PKGBUILD2016-05-24 12:36:49 UTC (rev 176224)
+++ PKGBUILD2016-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

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

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

2 matches

Site Navigation

Mail list logo

Footer information