src-exts: build with ghc 8 in experimental

3 files changed, 49 insertions, 26 deletions

diff --git a/p/haskell-src-exts/debian/changelog b/p/haskell-src-exts/debian/changelog
index 658aae113..c54138380 100644
--- a/p/haskell-src-exts/debian/changelog
+++ b/p/haskell-src-exts/debian/changelog
@@ -1,3 +1,10 @@
+haskell-src-exts (1.17.1-3) experimental; urgency=medium
+
+  * Temporarily build-depend on ghc 8.
+  * Disable special arch-handling to see what still breaks.
+
+ -- Clint Adams <clint@debian.org>  Sun, 16 Oct 2016 01:35:33 -0400
+
 haskell-src-exts (1.17.1-2) unstable; urgency=medium
 
   [ Dmitry Bogatov ]
diff --git a/p/haskell-src-exts/debian/control b/p/haskell-src-exts/debian/control
index db33540fe..c64c2a4c7 100644
--- a/p/haskell-src-exts/debian/control
+++ b/p/haskell-src-exts/debian/control
@@ -1,30 +1,36 @@
 Source: haskell-src-exts
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Uploaders: Joachim Breitner <nomeata@debian.org>
+Uploaders:
+ Joachim Breitner <nomeata@debian.org>,
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
+Build-Depends:
  cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
  ghc-prof,
  happy (>= 1.17),
+ haskell-devscripts (>= 0.10),
  libghc-cpphs-dev (>= 1.3),
  libghc-cpphs-prof,
-Build-Depends-Indep: ghc-doc,
+Build-Depends-Indep:
+ ghc-doc,
  libghc-cpphs-doc,
 Standards-Version: 3.9.8
 Homepage: https://github.com/haskell-suite/haskell-src-exts
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-src-exts
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: libghc-src-exts-dev
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${shlibs:Depends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: Haskell-Source with eXtensions library for GHC${haskell:ShortBlurb}
  haskell-src-exts (HSX, haskell-source with extensions) is an extension of the
  standard haskell-src package, and handles most common syntactic extensions to
@@ -40,11 +46,14 @@ Description: Haskell-Source with eXtensions library for GHC${haskell:ShortBlurb}
 
 Package: libghc-src-exts-prof
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
+Depends:
+ ${haskell:Depends},
  ${misc:Depends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${shlibs:Depends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
 Description: Haskell-Source with eXtensions library for GHC${haskell:ShortBlurb}
  haskell-src-exts (HSX, haskell-source with extensions) is an extension of the
  standard haskell-src package, and handles most common syntactic extensions to
@@ -61,13 +70,19 @@ Description: Haskell-Source with eXtensions library for GHC${haskell:ShortBlurb}
 Package: libghc-src-exts-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends},
+Depends:
  ${haskell:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: haskell-src-exts-doc (<< 1.8.2-2),
-Provides: haskell-src-exts-doc,
-Replaces: haskell-src-exts-doc (<< 1.8.2-2),
+ ${misc:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Conflicts:
+ haskell-src-exts-doc (<< 1.8.2-2),
+Provides:
+ haskell-src-exts-doc,
+Replaces:
+ haskell-src-exts-doc (<< 1.8.2-2),
 Description: API documentation of the haskell-src-exts library${haskell:ShortBlurb}
  haskell-src-exts (HSX, haskell-source with extensions) is an extension of the
  standard haskell-src package, and handles most common syntactic extensions to
diff --git a/p/haskell-src-exts/debian/rules b/p/haskell-src-exts/debian/rules
index 57e28e0fc..2b4127479 100755
--- a/p/haskell-src-exts/debian/rules
+++ b/p/haskell-src-exts/debian/rules
@@ -17,13 +17,14 @@ DEB_SETUP_GHC_CONFIGURE_ARGS = --ghc-options="+RTS -V0 -RTS"
 # http://hostingfu.com/article/compiling-with-gcc-on-low-memory-vps
 #  -- Dejan Latinovic <Dejan.Latinovic@imgtec.com>
 DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
-       DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc--param -optcggc-min-expand=10"
-endif
 
-ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el))
-       DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mxgot"
-endif
+#ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
+#       DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc--param -optcggc-min-expand=10"
+#endif
+#
+#ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el))
+#       DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mxgot"
+#endif
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk