Commit 13cb8161 authored by Gianfranco Costamagna's avatar Gianfranco Costamagna
Browse files

ghc: fix various build failures, patch refresh

parent 843239f1

p/ghc/debian/changelog

+8 −0
Original line number Diff line number Diff line 
ghc (8.8.1+dfsg1-1~exp2) experimental; urgency=medium



  * Followup upstream change in ghc configure script to fix a configure error

  * Depend on alex

  * Refresh s390x patch



 -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 10 Sep 2019 17:37:37 +0200



ghc (8.8.1+dfsg1-1~exp1) experimental; urgency=medium



  * New upstream release, patch refresh

p/ghc/debian/control

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Uploaders: Joachim Breitner <nomeata@debian.org>, Clint Adams <clint@debian.org> 
Standards-Version: 4.4.0

Rules-Requires-Root: no

Build-Depends:

  alex,

  debhelper (>= 10),

  haskell-devscripts-minimal <!cross>,

  devscripts,

p/ghc/debian/patches/Disable-unboxed-arrays.patch

+2 −2
Original line number Diff line number Diff line 
Origin: https://gitlab.haskell.org/ghc/ghc/issues/15411#note_215852

Index: ghc-8.6.1/libraries/containers/include/containers.h

===================================================================

--- ghc-8.6.1.orig/libraries/containers/include/containers.h

+++ ghc-8.6.1/libraries/containers/include/containers.h

--- ghc-8.6.1.orig/libraries/containers/containers/include/containers.h

+++ ghc-8.6.1/libraries/containers/containers/include/containers.h

@@ -35,7 +35,6 @@

 

 #ifdef __GLASGOW_HASKELL__

p/ghc/debian/rules

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ endif 


ProjectVersion=$(shell cat VERSION)



GHC=$(firstword $(shell bash -c "type -p ghc"))

EXTRA_CONFIGURE_FLAGS +=--with-ghc="$(GHC)"

export GHC=$(firstword $(shell bash -c "type -p ghc"))



DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/