[Git][haskell-team/DHG_packages][master] 2 commits: hs-bibutils: Patch to work with bibutils-6.2
Ilias Tsitsimpis
gitlab at salsa.debian.org
Sat Oct 13 09:41:33 BST 2018
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
7ab11378 by Ilias Tsitsimpis at 2018-10-13T08:38:07Z
hs-bibutils: Patch to work with bibutils-6.2
- - - - -
914460c0 by Ilias Tsitsimpis at 2018-10-13T08:39:35Z
vector: Disable tests on i386, riscv64, alpha, hurd-i386, and x32
Tests fail to build on these architectures with out-of-memory error.
This has been reported as GHC bug here:
https://ghc.haskell.org/trac/ghc/ticket/13535
- - - - -
6 changed files:
- p/haskell-hs-bibutils/debian/changelog
- + p/haskell-hs-bibutils/debian/patches/patch-to-build-with-bibutils-6.2.patch
- − p/haskell-hs-bibutils/debian/patches/patch-to-build-with-ghc-8.4.patch
- p/haskell-hs-bibutils/debian/patches/series
- p/haskell-vector/debian/changelog
- p/haskell-vector/debian/rules
Changes:
=====================================
p/haskell-hs-bibutils/debian/changelog
=====================================
@@ -1,8 +1,8 @@
haskell-hs-bibutils (6.6.0.0-2) unstable; urgency=medium
- * Patch to build with ghc-8.4
+ * Patch to build with bibutils-6.2
- -- Dmitry Bogatov <KAction at gnu.org> Thu, 04 Oct 2018 22:15:12 +0000
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Thu, 11 Oct 2018 17:33:52 +0300
haskell-hs-bibutils (6.6.0.0-1) unstable; urgency=medium
=====================================
p/haskell-hs-bibutils/debian/patches/patch-to-build-with-bibutils-6.2.patch
=====================================
@@ -0,0 +1,15 @@
+Index: b/src/Text/Bibutils.hsc
+===================================================================
+--- a/src/Text/Bibutils.hsc
++++ b/src/Text/Bibutils.hsc
+@@ -418,6 +418,10 @@ newtype BiblioIn = BiblioIn { unBiblio
+ newtype BiblioOut = BiblioOut { unBiblioOut :: CInt }
+ deriving ( Eq )
+
++#ifndef BIBL_NBIBOUT
++#define BIBL_NBIBOUT (BIBL_FIRSTOUT+7)
++#endif
++
+ #{enum BiblioOut, BiblioOut
+ , mods_out = BIBL_MODSOUT
+ , bibtex_out = BIBL_BIBTEXOUT
=====================================
p/haskell-hs-bibutils/debian/patches/patch-to-build-with-ghc-8.4.patch deleted
=====================================
@@ -1,20 +0,0 @@
-Index: haskell-hs-bibutils/src/Text/Bibutils.hsc
-===================================================================
---- haskell-hs-bibutils.orig/src/Text/Bibutils.hsc
-+++ haskell-hs-bibutils/src/Text/Bibutils.hsc
-@@ -93,7 +93,6 @@ module Text.Bibutils
- , isi_out
- , word2007_out
- , adsab_out
-- , nbib_out
-
- -- * Options for Specific Output Formats
- , FormatOpt
-@@ -426,7 +425,6 @@ newtype BiblioOut = BiblioOut { unBiblio
- , isi_out = BIBL_ISIOUT
- , word2007_out = BIBL_WORD2007OUT
- , adsab_out = BIBL_ADSABSOUT
-- , nbib_out = BIBL_NBIBOUT
- }
-
- newtype FormatOpt = FormatOpt { unFormatOpt :: CInt }
=====================================
p/haskell-hs-bibutils/debian/patches/series
=====================================
@@ -1,3 +1,3 @@
fix_cabal.patch
bibutils-include-path
-patch-to-build-with-ghc-8.4.patch
+patch-to-build-with-bibutils-6.2.patch
=====================================
p/haskell-vector/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-vector (0.12.0.1-7) unstable; urgency=medium
+
+ * Disable tests on i386, riscv64, alpha, hurd-i386, and x32 because
+ they fail to build with out-of-memory error.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 12 Oct 2018 16:33:14 +0300
+
haskell-vector (0.12.0.1-6) unstable; urgency=medium
[ Clint Adams ]
=====================================
p/haskell-vector/debian/rules
=====================================
@@ -1,8 +1,12 @@
#!/usr/bin/make -f
-ifeq (,$(filter $(DEB_BUILD_ARCH),mips mipsel mips64el armel armhf))
+ifeq (,$(filter $(DEB_BUILD_ARCH),mips mipsel mips64el armel armhf i386 riscv64 alpha hurd-i386 x32))
DEB_ENABLE_TESTS = yes
else
+# Tests on i386, riscv64, alpha, hurd-i386 and x32 currently fail to
+# build with out-of-memory error.
+# This has been reported as a GHC bug here:
+# https://ghc.haskell.org/trac/ghc/ticket/13535
DEB_ENABLE_TESTS = no
endif
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/094ce1bb89afc210023aa9f0085582ab931eb480...914460c04b2e05197604b9a8547a01fad50e125b
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/094ce1bb89afc210023aa9f0085582ab931eb480...914460c04b2e05197604b9a8547a01fad50e125b
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/20181013/f19978a4/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list