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

[Felix Yan]

    Date: Thursday, September 21, 2017 @ 07:23:38
  Author: felixonmars
Revision: 258986

upgpkg: ghc 8.2.1-2

move static hi files to static subpackage

Modified:
  ghc/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-21 07:21:10 UTC (rev 258985)
+++ PKGBUILD	2017-09-21 07:23:38 UTC (rev 258986)
@@ -13,7 +13,7 @@
 pkgbase=ghc
 pkgname=(ghc-libs ghc ghc-static)
 pkgver=8.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
@@ -60,7 +60,7 @@
   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 ! \( -name "*.a" -o -name "*.p_hi" -o -name "*.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/bin "$pkgdir"/usr/share/man
@@ -78,7 +78,7 @@
   make DESTDIR="$pkgdir" install
 
   # Remove static libs
-  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
+  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete
 
   # ghc-pkg is in ghc-libs
   rm "$pkgdir"/usr/lib/ghc-$pkgver/bin/ghc-pkg*
@@ -154,7 +154,7 @@
   make DESTDIR="$pkgdir" install
 
   # Remove static libs
-  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" \) -delete
+  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete
 
   # ghc library and other exes are in the ghc package
   rm -r "$pkgdir"/usr/lib/ghc-$pkgver/ghc-$pkgver