summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Reuße2016-01-30 20:39:08 +0100
committerSebastian Reuße2016-01-30 20:39:08 +0100
commitc0848c803c079fd00ee148a11ee0eebc8c7f2653 (patch)
tree37ab4093ea5045067ca68804f59bc5e84c00d6db
parentb6b50ffc2dc48f4cbaa7b65241a549af7b3c75ae (diff)
downloadaur-c0848c803c079fd00ee148a11ee0eebc8c7f2653.tar.gz
Do build dependencies as shared libraries, too.
optparse-applicative currently won’t build when transformers resp. transformers-compat are not built as shared libraries (causing missing .so errors when building). This holds even when we are only making a static executable, for reasons unknown to me. It appears to be a known issue that modules pulling in TemplateHaskell without properly declaring this can cause such problems, but neither transformers nor transformers-compat appear to use TemplateHaskell.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 265f55153470..cef226dada0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Jan 30 19:39:08 UTC 2016
pkgbase = resolve-trivial-conflicts-git
pkgdesc = Resolve trivial conflicts automatically when merging branches in git repositories.
- pkgver = r52.48ae21a
+ pkgver = r70.84d10f2
pkgrel = 1
url = https://github.com/ElastiLotem/resolve-trivial-conflicts
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index a711e79452ce..c8adaba685fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Sebastian Reuße <seb@wirrsal.net>
pkgname=resolve-trivial-conflicts-git
_gitname=resolve-trivial-conflicts
-pkgver=r52.48ae21a
+pkgver=r70.84d10f2
pkgrel=1
pkgdesc="Resolve trivial conflicts automatically when merging branches in git repositories."
arch=(i686 x86_64)
@@ -26,7 +26,7 @@ build() {
cd "$_gitname"
cabal update
cabal sandbox init
- cabal install --dependencies-only --disable-shared
+ cabal install --dependencies-only
cabal configure --prefix /usr --disable-executable-dynamic
cabal build
}