From bb216081dabb32f4bc3ada2573ed7dbfb55a585a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 28 Jul 2021 14:46:08 +0200 Subject: [PATCH] cabal-install: disable ofd-locking on i686. Broken upstream, see https://github.com/haskellari/lukko/issues/15 --- srcpkgs/cabal-install/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index 99ebb54427fee9..18ce63f254c77d 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,7 +1,7 @@ # Template file for 'cabal-install' pkgname=cabal-install version=3.4.0.0 -revision=1 +revision=2 wrksrc=cabal-${pkgname}-${version} hostmakedepends="ghc curl tar which" makedepends="gmp-devel libffi-devel zlib-devel python3" @@ -15,6 +15,14 @@ checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c nopie_files="/usr/bin/cabal" nocross=yes +post_patch() { + case "${XBPS_TARGET_MACHINE}" in + i686*) + # https://github.com/haskell/cabal/issues/7313 + vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;; + esac +} + do_build() { PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json }