[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk silence-gen_contents_index.diff)

[Thomas Dziedzic]

    Date: Sunday, June 10, 2012 @ 20:02:41
  Author: tdziedzic
Revision: 161392

upgpkg: ghc 7.4.2-1

bump

Added:
  ghc/trunk/silence-gen_contents_index.diff
Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/build.mk

---------------------------------+
 PKGBUILD                        |   26 ++++++++++++++++----------
 build.mk                        |    4 ++--
 silence-gen_contents_index.diff |   10 ++++++++++
 3 files changed, 28 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-10 21:12:29 UTC (rev 161391)
+++ PKGBUILD	2012-06-11 00:02:41 UTC (rev 161392)
@@ -7,8 +7,8 @@
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 
 pkgname=ghc
-pkgver=7.4.1
-pkgrel=2
+pkgver=7.4.2
+pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
@@ -22,7 +22,7 @@
 options=('!makeflags')
 # missing rtl?
 provides=('haskell-array=0.4.0.0'
-          'haskell-base=4.5.0.0'
+          'haskell-base=4.5.1.0'
           'haskell-binary=0.5.1.0'
           'haskell-bin-package-db=0.0.0.0'
           'haskell-bytestring=0.9.2.1'
@@ -43,11 +43,11 @@
           'haskell-process=1.1.0.1'
           'haskell-template-haskell=2.7.0.0'
           'haskell-time=1.4'
-          'haskell-unix=2.5.1.0'
+          'haskell-unix=2.5.1.1'
           'haskell-cabal=1.14.0'
          )
 replaces=('haskell-array<0.4.0.0'
-          'haskell-base<4.5.0.0'
+          'haskell-base<4.5.1.0'
           'haskell-binary<0.5.1.0'
           'haskell-bin-package-db<0.0.0.0'
           'haskell-bytestring<0.9.2.1'
@@ -68,19 +68,25 @@
           'haskell-process<1.1.0.1'
           'haskell-template-haskell<2.7.0.0'
           'haskell-time<1.4'
-          'haskell-unix<2.5.1.0'
+          'haskell-unix<2.5.1.1'
           'haskell-cabal<1.14.0'
          )
 source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('5d86c420978b49cc60edea9bd4c36703'
-         '54bc9405c14c3226b6e3de3cd61e2777'
-         '82b67cdd24a2e434a4399f30f14b21a3')
+        'build.mk'
+        'silence-gen_contents_index.diff')
+md5sums=('267462db5c5a7c245fb26361b77007c4'
+         '528005749c761fe6c12a0079bd84fb90'
+         '88ad4108c26f56fc38466d82aaf9a295'
+         '2ac480d025b706fc47acc58c54b246bb')
 
 build() {
   cd ghc-${pkgver}
 
+  # Silence gen_contents_index for the common case.
+  # http://hackage.haskell.org/trac/ghc/ticket/5992
+  patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff
+
   cp ${srcdir}/build.mk mk/build.mk
 
   ./configure \

Modified: build.mk
===================================================================
--- build.mk	2012-06-10 21:12:29 UTC (rev 161391)
+++ build.mk	2012-06-11 00:02:41 UTC (rev 161392)
@@ -117,7 +117,7 @@
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
+LAX_DEPENDENCIES   = YES
 
 endif
 
@@ -134,7 +134,7 @@
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
+LAX_DEPENDENCIES   = YES
 
 # After stage 1 and the libraries have been built, you can uncomment this line:
 

Added: silence-gen_contents_index.diff
===================================================================
--- silence-gen_contents_index.diff	                        (rev 0)
+++ silence-gen_contents_index.diff	2012-06-11 00:02:41 UTC (rev 161392)
@@ -0,0 +1,10 @@
+--- ghc-7.4.2/libraries/gen_contents_index.original	2012-06-10 22:23:28.810059378 +0000
++++ ghc-7.4.2/libraries/gen_contents_index	2012-06-10 22:24:00.289814576 +0000
+@@ -47,7 +47,6 @@
+ esac
+ 
+ # Now create the combined contents and index pages
+-echo $HADDOCK_ARGS
+ $HADDOCK --gen-index --gen-contents -o . \
+          -t "Haskell Hierarchical Libraries" \
+          -p "prologue.txt" \