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

[Felix Yan]

    Date: Monday, July 3, 2017 @ 09:27:39
  Author: felixonmars
Revision: 242136

upgpkg: ghc 8.0.2-2

- provide profiling libraries again in ghc-static
- provide an alternative global package DB for static (boot) libraries

Modified:
  ghc/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-03 09:22:20 UTC (rev 242135)
+++ PKGBUILD	2017-07-03 09:27:39 UTC (rev 242136)
@@ -14,7 +14,7 @@
 pkgbase=ghc
 pkgname=(ghc ghc-static)
 pkgver=8.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
@@ -37,10 +37,8 @@
 
   cd ghc-$pkgver
 
-  # 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() {
@@ -62,8 +60,10 @@
 
   make DESTDIR="$pkgdir" -j1 install
 
-  find "$pkgdir"/usr/lib ! -name "*.a" -type f -delete
+  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
 }
 
@@ -136,7 +136,7 @@
   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
+  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
 
   install -Dm644 utils/completion/ghc.bash \
     "$pkgdir/usr/share/bash-completion/completions/ghc"