[Git][haskell-team/DHG_packages][experimental] ghc: revert broken LLVM change

[Clint Adams]

Clint Adams pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
8b2fce92 by Clint Adams at 2018-07-18T22:16:13-04:00
ghc: revert broken LLVM change

- - - - -


3 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/control
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,9 @@
+ghc (8.4.3-3) UNRELEASED; urgency=medium
+
+  * Revert broken LLVM change.
+
+ -- Clint Adams <clint at debian.org>  Wed, 18 Jul 2018 22:16:02 -0400
+
 ghc (8.4.3-2) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]


=====================================
p/ghc/debian/control
=====================================
--- a/p/ghc/debian/control
+++ b/p/ghc/debian/control
@@ -3,7 +3,7 @@ Section: haskell
 Priority: optional
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Joachim Breitner <nomeata at debian.org>, Clint Adams <clint at 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
=====================================
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -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



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/8b2fce9217805a41dceaeec75217998760ecab87

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/8b2fce9217805a41dceaeec75217998760ecab87
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180719/19a8a498/attachment-0001.html>