[Git][haskell-team/DHG_packages][master] 4 commits: haskell-primitive-unaligned: cherry-pick from Ubuntu test disable on armhf, ...

[Gianfranco Costamagna]

Gianfranco Costamagna pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
db942c5d by Gianfranco Costamagna at 2020-07-30T16:35:15+02:00
haskell-primitive-unaligned: cherry-pick from Ubuntu test disable on armhf, FTBFS when run on arm64 kernel

- - - - -
cd60867c by Gianfranco Costamagna at 2020-07-30T16:35:15+02:00
haskell-primitive-unaligned: cherry-pick upstreak proposed fix for ppc64el build failure, don't run tests on armhf, failing with unaligned access on 64bit kernels

- - - - -
2ec8ec83 by Gianfranco Costamagna at 2020-07-30T16:35:15+02:00
haskell-token-bucket: upload to sid

- - - - -
a428ac7d by Gianfranco Costamagna at 2020-07-30T16:35:15+02:00
ghc: upload to unstable to fix s390x build issues

- - - - -


6 changed files:

- p/ghc/debian/changelog
- p/haskell-primitive-unaligned/debian/changelog
- + p/haskell-primitive-unaligned/debian/patches/8.patch
- p/haskell-primitive-unaligned/debian/patches/series
- p/haskell-primitive-unaligned/debian/rules
- p/haskell-token-bucket/debian/changelog


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,11 +1,11 @@
-ghc (8.8.3-2) UNRELEASED; urgency=medium
+ghc (8.8.3-2) unstable; urgency=medium
 
   * Cherry-pick Ubuntu patches
   * Also limit parallel building to 2 on arm64, because Ubuntu fails
     with ENOMEM with parallel=4
   * Fix ByteOrder on s390x.
 
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 28 May 2020 13:45:02 +0200
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 30 Jul 2020 16:34:22 +0200
 
 ghc (8.8.3-1) unstable; urgency=medium
 


=====================================
p/haskell-primitive-unaligned/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+haskell-primitive-unaligned (0.1.1.1-3) unstable; urgency=medium
+
+  * debian/patches/8.patch:
+    - cherry-pick upstream proposed patch to fix a build failure on ppc64el
+  * Ignore tests on armhf, failing with an arm64 kernel (from Ubuntu)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 30 Jul 2020 16:15:20 +0200
+
 haskell-primitive-unaligned (0.1.1.1-2) unstable; urgency=medium
 
   * Backport upstream patch to compile an all available arches


=====================================
p/haskell-primitive-unaligned/debian/patches/8.patch
=====================================
@@ -0,0 +1,23 @@
+From 52fb6acf3b988cb0f433e34cadd1108437a8136e Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Date: Thu, 30 Jul 2020 16:14:45 +0200
+Subject: [PATCH] Support ppc64 architecture in cabal file
+
+Debian calls it ppc64 instead of powerpc64
+---
+ primitive-unaligned.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/primitive-unaligned.cabal b/primitive-unaligned.cabal
+index ab17a4b..c3ed14f 100644
+--- a/primitive-unaligned.cabal
++++ b/primitive-unaligned.cabal
+@@ -22,7 +22,7 @@ library
+     , base >=4.12.0.0 && <5
+     , primitive >=0.6.4 && <0.8
+   hs-source-dirs: src
+-  if arch(aarch64) || arch(alpha) || arch(ia64) || arch(powerpc64) || arch(powerpc64le) || arch(riscv64) || arch(s390x) || arch(sparc64) || arch(x86_64) || arch(mips64el)
++  if arch(aarch64) || arch(alpha) || arch(ia64) || arch(ppc64) || arch(powerpc64) || arch(powerpc64le) || arch(riscv64) || arch(s390x) || arch(sparc64) || arch(x86_64) || arch(mips64el)
+     hs-source-dirs: src-64
+   if arch(arm) || arch(hppa) || arch(hppa1_1) || arch(i386) || arch(m68k) || arch(mips) || arch(mipseb) || arch(mipsel) || arch(nios2) || arch(powerpc) || arch(riscv32) || arch(rs6000) || arch(s390) || arch(sh4) || arch(sparc) || arch(vax)
+     hs-source-dirs: src-32


=====================================
p/haskell-primitive-unaligned/debian/patches/series
=====================================
@@ -1 +1,2 @@
 support-more-arches
+8.patch


=====================================
p/haskell-primitive-unaligned/debian/rules
=====================================
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/default.mk
+
+ifneq ($(DEB_HOST_ARCH),armhf)
 DEB_ENABLE_TESTS = yes
+endif
 DEB_SETUP_BIN_NAME = debian/hlibrary.setup
 DEB_CABAL_PACKAGE = primitive-unaligned
 DEB_DEFAULT_COMPILER = ghc


=====================================
p/haskell-token-bucket/debian/changelog
=====================================
@@ -1,4 +1,4 @@
-haskell-token-bucket (0.1.0.1-11) UNRELEASED; urgency=medium
+haskell-token-bucket (0.1.0.1-11) unstable; urgency=medium
 
   * Disable tests on riscv64, they do timeout
 



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/8966d556e57b5a3660895ee53c2d7aca32d0ef2a...a428ac7d79fd915e6261a2d10e14c7d5c33376e0

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/8966d556e57b5a3660895ee53c2d7aca32d0ef2a...a428ac7d79fd915e6261a2d10e14c7d5c33376e0
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/20200730/2ff871f6/attachment-0001.html>