Commit 8b2fce92 authored by Clint Adams's avatar Clint Adams
Browse files

ghc: revert broken LLVM change

parent 7be959fb

p/ghc/debian/changelog

+6 −0
Original line number Diff line number Diff line 
ghc (8.4.3-3) UNRELEASED; urgency=medium



  * Revert broken LLVM change.



 -- Clint Adams <clint@debian.org>  Wed, 18 Jul 2018 22:16:02 -0400



ghc (8.4.3-2) experimental; urgency=medium



  [ Gianfranco Costamagna ]

p/ghc/debian/control

+5 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Section: haskell 
Priority: optional

Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>

Uploaders: Joachim Breitner <nomeata@debian.org>, Clint Adams <clint@debian.org>

Standards-Version: 4.1.4

Standards-Version: 4.1.5

Rules-Requires-Root: no

Build-Depends:

  debhelper (>= 10),
@@ -13,7 +13,7 @@ Build-Depends: 
  pkg-config,

  ghc:native (>= 7.8),

  libgmp-dev,

  llvm-6.0 [arm64 armel armhf],

  llvm-5.0 [arm64 armel armhf],

  libffi-dev,

  libncurses5-dev,

  python-sphinx <!cross>,
@@ -22,14 +22,14 @@ Build-Depends-Indep: 
  hscolour,

  fop

Build-Conflicts: ccache

Homepage: http://haskell.org/ghc/

Homepage: https://haskell.org/ghc/

Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/ghc]

Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/ghc



Package: ghc

Architecture: any

Depends:

  llvm-6.0 [arm64 armel armhf],

  llvm-5.0 [arm64 armel armhf],

  gcc,

  libgmp-dev,

  libffi-dev,
@@ -51,7 +51,7 @@ Provides: 
Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10)

Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8), libghc-cabal-dev (<< 1.24.2.1), ${conflicting-devs}

Breaks: cabal-install (<< 1.22), haskell-devscripts (<< 0.8.13), ghc-doc (<< 7.10), ghc-haddock (<< 7.10)

Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-6.0

Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-5.0

Description: The Glasgow Haskell Compilation system

 The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for

 Haskell.

p/ghc/debian/rules

+1 −3
Original line number Diff line number Diff line
@@ -126,9 +126,7 @@ endif 
	echo 'V=1'                                     >> mk/build.mk

	./configure $(confflags) --prefix=/usr \

		$(EXTRA_CONFIGURE_FLAGS) \

		--with-system-libffi \

		--with-llc=llc-6.0 \

		--with-opt=opt-6.0

		--with-system-libffi



override_dh_auto_build:

	dh_auto_build