[Git][haskell-team/DHG_packages][master] 2 commits: Try to fix s390x build

[Gianfranco Costamagna]

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


Commits:
c7666645 by Gianfranco Costamagna at 2019-08-02T14:14:21Z
Try to fix s390x build

- - - - -
87b8d064 by Gianfranco Costamagna at 2019-08-02T14:14:21Z
ghc: Do not force parallel=4 on s390x

- - - - -


3 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/Disable-unboxed-arrays.patch
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,9 +1,15 @@
-ghc (8.6.5+dfsg1-3) UNRELEASED; urgency=medium
+ghc (8.6.5+dfsg1-3) unstable; urgency=medium
 
+  [ Gianfranco Costamagna ]
+  * debian/patches/Disable-unboxed-arrays.patch
+    - upstream proposed workaround for BE build failures.
+  * use parallel=2 for s390x builds
+
+  [ Clint Adams ]
   * Patch from John Paul Adrian Glaubitz to set --host and --build for
     cross-builds.  closes: #933306.
 
- -- Clint Adams <clint at debian.org>  Sun, 28 Jul 2019 20:02:11 -0400
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 01 Aug 2019 12:56:23 +0200
 
 ghc (8.6.5+dfsg1-2) unstable; urgency=medium
 


=====================================
p/ghc/debian/patches/Disable-unboxed-arrays.patch
=====================================
@@ -0,0 +1,13 @@
+Origin: https://gitlab.haskell.org/ghc/ghc/issues/15411#note_215852
+Index: ghc-8.6.1/libraries/containers/include/containers.h
+===================================================================
+--- ghc-8.6.1.orig/libraries/containers/include/containers.h
++++ ghc-8.6.1/libraries/containers/include/containers.h
+@@ -35,7 +35,6 @@
+ 
+ #ifdef __GLASGOW_HASKELL__
+ # define USE_ST_MONAD 1
+-# define USE_UNBOXED_ARRAYS 1
+ #endif
+ 
+ #endif


=====================================
p/ghc/debian/rules
=====================================
@@ -22,6 +22,7 @@ export HOME = /homedoesnotexistatbuildtime
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_TARGET_ARCH_ENDIAN	?= $(shell dpkg-architecture -qDEB_TARGET_ARCH_ENDIAN)
 
 # We're cross-building if DEB_BUILD_GNU_TYPE != DEB_HOST_GNU_TYPE
 ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -54,6 +55,10 @@ ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
   EXTRA_CONFIGURE_FLAGS += --disable-ld-override
 endif
 
+ifeq (s390x,$(DEB_HOST_ARCH))
+  export DEB_BUILD_OPTIONS=parallel=2
+endif
+
 %:
 	dh $@
 
@@ -82,6 +87,9 @@ endif
 ifeq (armhf,$(DEB_HOST_ARCH))
 	echo "SRC_HC_OPTS += -D__ARM_PCS_VFP" >> mk/build.mk
 endif
+ifeq (big, $(DEB_TARGET_ARCH_ENDIAN))
+	patch -p1 < debian/patches/Disable-unboxed-arrays.patch
+endif
 ifneq (,$(filter mips mipsel, $(DEB_HOST_ARCH)))
 	echo "SRC_HC_OPTS     += -optc--param -optcggc-min-expand=10" >> mk/build.mk
 endif



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/c6ca44325f1a41ad1dae1c01a4e3277db5eef152...87b8d064e6347ab103fcfadf4c03d6823235031d

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/c6ca44325f1a41ad1dae1c01a4e3277db5eef152...87b8d064e6347ab103fcfadf4c03d6823235031d
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/20190802/3f6db2eb/attachment-0001.html>