[Git][haskell-team/DHG_packages][master] 5 commits: gloss: Re-enable optimizations on unregisterised 64-bit arches
Ilias Tsitsimpis
gitlab at salsa.debian.org
Tue Sep 24 17:07:16 BST 2019
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
045160ff by Ilias Tsitsimpis at 2019-09-24T15:23:09Z
gloss: Re-enable optimizations on unregisterised 64-bit arches
- - - - -
0836ed74 by Ilias Tsitsimpis at 2019-09-24T15:23:11Z
juicypixels: Re-enable optimizations on unregisterised 64-bit arches
- - - - -
9c555dfe by Ilias Tsitsimpis at 2019-09-24T15:33:54Z
email-validate: Remove unused patches
- - - - -
0edc59d5 by Ilias Tsitsimpis at 2019-09-24T15:35:43Z
jwt: Re-enable doctests on armel
- - - - -
6ce4ae87 by Ilias Tsitsimpis at 2019-09-24T15:55:36Z
servant: Remove unused patches
- - - - -
14 changed files:
- − p/haskell-email-validate/debian/patches/disable-doctests
- − p/haskell-email-validate/debian/patches/series
- p/haskell-email-validate/debian/rules
- p/haskell-gloss/debian/changelog
- p/haskell-gloss/debian/rules
- p/haskell-juicypixels/debian/changelog
- p/haskell-juicypixels/debian/rules
- p/haskell-jwt/debian/changelog
- − p/haskell-jwt/debian/patches/disable-doctests
- − p/haskell-jwt/debian/patches/series
- p/haskell-jwt/debian/rules
- − p/haskell-servant/debian/patches/disable-doctests
- − p/haskell-servant/debian/patches/series
- p/haskell-servant/debian/rules
Changes:
=====================================
p/haskell-email-validate/debian/patches/disable-doctests deleted
=====================================
@@ -1,28 +0,0 @@
-Description: Add test-doctests flag
- Add flag to enable/disable the doctest suite. This is needed because doctests
- fail on armel because of #839840.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
----
-
---- a/email-validate.cabal
-+++ b/email-validate.cabal
-@@ -21,6 +21,10 @@
- location: git://github.com/Porges/email-validate-hs.git
- tag: v2.3.2.11
-
-+flag test-doctests
-+ description: Enable/Disable the doctest suite
-+ default: True
-+
- library
- build-depends:
- base >= 4.4 && < 5,
-@@ -50,6 +54,8 @@
-
- test-suite doctests
- type: exitcode-stdio-1.0
-+ if !flag(test-doctests)
-+ buildable: False
- ghc-options: -threaded
- default-language: Haskell2010
- hs-source-dirs: tests
=====================================
p/haskell-email-validate/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-disable-doctests
=====================================
p/haskell-email-validate/debian/rules
=====================================
@@ -2,10 +2,5 @@
DEB_ENABLE_TESTS = yes
-# doctests fail on armel due to #839840
-# ifeq (armel,$(DEB_HOST_ARCH))
-# DEB_SETUP_GHC_CONFIGURE_ARGS += -f-test-doctests
-# endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-gloss/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-gloss (1.13.0.1-4) UNRELEASED; urgency=medium
+
+ * Re-enable optimizations on unregisterised 64-bit arches, since the
+ corresponding GHC bug has been fixed.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 24 Sep 2019 18:18:29 +0300
+
haskell-gloss (1.13.0.1-3) unstable; urgency=medium
* debian/patches/newer-deps:
=====================================
p/haskell-gloss/debian/rules
=====================================
@@ -1,11 +1,4 @@
#!/usr/bin/make -f
-# Work-around a bug in GHC where it fails to compile gloss
-# on 64-bit unregisterised arches.
-# https://ghc.haskell.org/trac/ghc/ticket/15853
-ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el s390x alpha ia64 riscv64 sparc64))
- DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-O0"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-juicypixels/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-juicypixels (3.3.3.1-2) UNRELEASED; urgency=medium
+
+ * Re-enable optimizations on unregisterised 64-bit arches, since the
+ corresponding GHC bug has been fixed.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 24 Sep 2019 18:21:57 +0300
+
haskell-juicypixels (3.3.3.1-1) unstable; urgency=medium
* New upstream version.
=====================================
p/haskell-juicypixels/debian/rules
=====================================
@@ -2,12 +2,5 @@
# DEB_ENABLE_TESTS = yes
-# Work-around a bug in GHC where it fails to compile juicypixels
-# on 64-bit unregisterised arches.
-# https://ghc.haskell.org/trac/ghc/ticket/15853
-ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el s390x alpha ia64 riscv64 sparc64))
- DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-O0"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-jwt/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-jwt (0.7.2-10) UNRELEASED; urgency=medium
+
+ * Re-enable doctests on armel, since #839840 has been fixed
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 24 Sep 2019 18:34:57 +0300
+
haskell-jwt (0.7.2-9) unstable; urgency=medium
* Remove build dependency on libghc-text-dev (provided by ghc-8.4.3)
=====================================
p/haskell-jwt/debian/patches/disable-doctests deleted
=====================================
@@ -1,22 +0,0 @@
---- a/jwt.cabal
-+++ b/jwt.cabal
-@@ -28,6 +28,10 @@
- type: git
- location: https://ssaasen@bitbucket.org/ssaasen/haskell-jwt.git
-
-+flag test-doctests
-+ description: enable doctests
-+ default: True
-+
- library
- exposed-modules: Web.JWT
- other-modules: Data.Text.Extended, Data.ByteString.Extended
-@@ -99,6 +103,8 @@
- type: exitcode-stdio-1.0
- main-is: doctests.hs
- ghc-options: -threaded
-+ if !flag(test-doctests)
-+ buildable: False
- build-depends: base < 5 && >= 4.4
- , jwt
- , doctest >= 0.9.11
=====================================
p/haskell-jwt/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-disable-doctests
=====================================
p/haskell-jwt/debian/rules
=====================================
@@ -5,10 +5,5 @@ DEB_ENABLE_TESTS = yes
DEB_CABAL_PACKAGE = jwt
DEB_DEFAULT_COMPILER = ghc
-# doctests fail on armel due to #839840
-ifeq (armel,$(DEB_HOST_ARCH))
- DEB_SETUP_GHC_CONFIGURE_ARGS += -f-test-doctests
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-servant/debian/patches/disable-doctests deleted
=====================================
@@ -1,29 +0,0 @@
-Description: Add test-doctests flag
- Add flag to enable/disable the doctest suite. This is needed because doctests
- fail on armel because of #839840.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
----
-
---- a/servant.cabal
-+++ b/servant.cabal
-@@ -29,6 +29,10 @@
- type: git
- location: http://github.com/haskell-servant/servant.git
-
-+flag test-doctests
-+ description: Enable/Disable the doctest suite
-+ default: True
-+
- custom-setup
- setup-depends:
- base >= 4 && <5,
-@@ -172,7 +176,8 @@
-
- type: exitcode-stdio-1.0
- main-is: test/doctests.hs
-- buildable: True
-+ if !flag(test-doctests)
-+ buildable: False
- default-language: Haskell2010
- ghc-options: -Wall -threaded
- if impl(ghc >= 8.2)
=====================================
p/haskell-servant/debian/patches/series deleted
=====================================
=====================================
p/haskell-servant/debian/rules
=====================================
@@ -6,10 +6,5 @@ DEB_DEFAULT_COMPILER = ghc
export LC_ALL=C.UTF-8
-# doctests fail on armel due to #839840
-# ifeq (armel,$(DEB_HOST_ARCH))
-# DEB_SETUP_GHC_CONFIGURE_ARGS += -f-test-doctests
-# endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/9b1127655804cb6660d980f48ca90e81fba77a6c...6ce4ae87a484c19fbf41d3325f92107e2e5b4583
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/9b1127655804cb6660d980f48ca90e81fba77a6c...6ce4ae87a484c19fbf41d3325f92107e2e5b4583
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/20190924/d7cd2caa/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list