From 4feaea39adc2ee2eb2be672ce032edcb50548dd9 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 10 Apr 2020 16:02:32 -0300 Subject: community/ghc: rebuild without libffi3.2 --- community/ghc/APKBUILD | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'community/ghc') diff --git a/community/ghc/APKBUILD b/community/ghc/APKBUILD index 885aee27d8..61c5edf826 100644 --- a/community/ghc/APKBUILD +++ b/community/ghc/APKBUILD @@ -2,7 +2,7 @@ pkgname=ghc pkgver=8.6.5 _llvmver=9 -pkgrel=4 +pkgrel=5 # Normal non rc candidate _urlprefix="$pkgver" _pkgprefix="$pkgname-$pkgver" @@ -23,7 +23,7 @@ license="BSD-3-Clause" # # Ref: https://ghc.haskell.org/trac/ghc/wiki/Status/GHC-8.0.1 # https://ghc.haskell.org/trac/ghc/wiki/ImprovedLLVMBackend -depends="gmp-dev perl gcc>=6.2.1 llvm$_llvmver libffi-dev libffi3.2" +depends="gmp-dev perl gcc>=6.2.1 llvm$_llvmver libffi-dev" # ghc is self-hosted, so we need ghc to build ghc. ghc-bootstrap is provided by # this aport (see below). makedepends_build="$pkgname-bootstrap @@ -57,7 +57,6 @@ if [ "$CBUILD" != "$CTARGET" ]; then source="$source 0000-bootstrap.patch" fi -builddir="$srcdir/$_pkgprefix" prepare() { default_prepare @@ -88,8 +87,6 @@ prepare() { } build() { - cd "$builddir" - local ffi_inc=$(pkg-config libffi --cflags-only-I); ffi_inc="${ffi_inc%% }" local ffi_lib=$(pkg-config libffi --libs-only-L); ffi_lib="${ffi_lib%% }" @@ -139,7 +136,6 @@ package() { local ghclib="usr/lib/ghc-$pkgver" local newpath path target - cd "$builddir" make -j1 DESTDIR="$pkgdir" install cd "$pkgdir" -- cgit v1.2.3