[Git][haskell-team/DHG_packages][master] ghc: don't reduce max-parallel for s390x and arm* builders, Ubuntu seems to build now correctly.

[Gianfranco Costamagna (@locutusofborg)]

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


Commits:
0add144c by Gianfranco Costamagna at 2022-10-03T11:47:11+02:00
ghc: don't reduce max-parallel for s390x and arm* builders, Ubuntu seems to build now correctly.
Enable unregisterised on armhf only in Ubuntu builds

- - - - -


1 changed file:

- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/rules
=====================================
@@ -47,6 +47,13 @@ ifneq (,$(filter i386 powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
   EXTRA_CONFIGURE_FLAGS += --enable-unregisterised
 endif
 
+ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+ifeq (armhf,$(DEB_HOST_ARCH))
+  # armhf on Ubuntu needs unregisterised due to performance issues during build.
+  EXTRA_CONFIGURE_FLAGS += --enable-unregisterised
+endif
+endif
+
 # Use system's default ld (ld.bfd) rather than ld.gold, which fails for
 # haskell-cryptohash-sha256 on mips/mipsel. For more information, see
 # https://bugs.debian.org/901947
@@ -59,14 +66,7 @@ ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
 endif
 
 %:
-ifneq (,$(filter s390x arm64 armhf, $(DEB_HOST_ARCH)))
-	# Build fails with out-of-memory on Ubuntu's s390x builders.
-	# Setting `ggc-min-expand=10` doesn't solve this.
-	# For now, reduce number of parallel jobs.
-	dh $@ --max-parallel=2
-else
 	dh $@
-endif
 
 override_dh_autoreconf:
 	dh_autoreconf perl -- boot



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/0add144c3ca1f00a8ea72900ce5e4681b21e19a7

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/0add144c3ca1f00a8ea72900ce5e4681b21e19a7
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/20221003/a2b06ac3/attachment-0001.htm>