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

[Levente Polyak]

    Date: Thursday, January 9, 2020 @ 23:45:18
  Author: anthraxx
Revision: 551520

upgpkg: xmonad 0.15-27: rebuild with PIE

Modified:
  xmonad/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-09 23:22:29 UTC (rev 551519)
+++ PKGBUILD	2020-01-09 23:45:18 UTC (rev 551520)
@@ -6,7 +6,7 @@
 
 pkgname=xmonad
 pkgver=0.15
-pkgrel=26
+pkgrel=27
 pkgdesc='Lightweight X11 tiled window manager written in Haskell'
 url='https://xmonad.org/'
 arch=('x86_64')
@@ -26,15 +26,23 @@
   gendesk --pkgname "${pkgname}" --pkgdesc "${pkgdesc}"
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/dynamic-compilation.patch"
-  sed -i -e '/semigroups/d' -e 's/< 1.10,/< 1.10/' ${pkgname}.cabal
+  sed -e 's/&& <.*,/,/g' -e 's/==.*,/,/g' -i ${pkgname}.cabal
 }
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-    --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="${pkgname}" \
-    --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup configure -O \
+    --enable-shared \
+    --enable-executable-dynamic \
+    --disable-library-vanilla \
+    --prefix=/usr \
+    --dynlibdir=/usr/lib \
+    --docdir="/usr/share/doc/${pkgname}" \
+    --datasubdir="${pkgname}" \
+    --libsubdir=\$compiler/site-local/\$pkgid \
+    --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \
+    --ghc-option='-pie'
   runhaskell Setup build
   runhaskell Setup register --gen-script
   runhaskell Setup unregister --gen-script