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

[Felix Yan]

    Date: Wednesday, January 8, 2020 @ 21:23:09
  Author: felixonmars
Revision: 550661

upgpkg: ghc 8.8.1-2

move static .o/.p_o files into ghc-static

Modified:
  ghc/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-08 21:22:45 UTC (rev 550660)
+++ PKGBUILD	2020-01-08 21:23:09 UTC (rev 550661)
@@ -12,7 +12,7 @@
 pkgbase=ghc
 pkgname=(ghc-libs ghc ghc-static)
 pkgver=8.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('x86_64')
 url='https://www.haskell.org/ghc/'
@@ -59,7 +59,7 @@
   make DESTDIR="$pkgdir" -j1 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" -o -name "*.hi" \) -type f -delete
+  find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -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
@@ -77,7 +77,7 @@
   make DESTDIR="$pkgdir" -j1 install
 
   # Remove static libs
-  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete
+  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -delete
 
   # ghc-pkg is in ghc-libs
   rm "$pkgdir"/usr/lib/ghc-$pkgver/bin/ghc-pkg*
@@ -164,7 +164,7 @@
   make DESTDIR="$pkgdir" -j1 install
 
   # Remove static libs
-  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete
+  find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -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