[Git][haskell-team/DHG_packages][master] 5 commits: ghc: Remove cap on parallel builds, use `ggc-min-expand=10` instead
Ilias Tsitsimpis
gitlab at salsa.debian.org
Fri Aug 30 13:26:51 BST 2019
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
54890c93 by Ilias Tsitsimpis at 2019-08-30T12:25:29Z
ghc: Remove cap on parallel builds, use `ggc-min-expand=10` instead
- - - - -
b59814bd by Ilias Tsitsimpis at 2019-08-30T12:25:29Z
ghc: Fix compilation on 32-bit unregisterised architectures
- - - - -
5081c177 by Ilias Tsitsimpis at 2019-08-30T12:25:29Z
ghc: Use mxgot only on the HsInstances object
- - - - -
c3c0c1bd by Ilias Tsitsimpis at 2019-08-30T12:25:29Z
ghc: Remove obsolete code
ld.gold is the default linker now.
- - - - -
aabcec2b by Ilias Tsitsimpis at 2019-08-30T12:25:29Z
Ignore vim swap files
- - - - -
3 changed files:
- .gitignore
- p/ghc/debian/changelog
- p/ghc/debian/rules
Changes:
=====================================
.gitignore
=====================================
@@ -7,4 +7,5 @@
dist
lab
*~
+*.swp
p/pandoc
=====================================
p/ghc/debian/changelog
=====================================
@@ -1,4 +1,4 @@
-ghc (8.6.5+dfsg1-4) UNRELEASED; urgency=medium
+ghc (8.6.5+dfsg1-4) unstable; urgency=medium
[ John Paul Adrian Glaubitz ]
* debian/patches/powerpc-fix-64-bit-comparision.patch
@@ -7,7 +7,12 @@ ghc (8.6.5+dfsg1-4) UNRELEASED; urgency=medium
[ Aurelien Jarno ]
* build with -mxgot on mips64el
- -- John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de> Fri, 09 Aug 2019 13:21:37 +0200
+ [ Ilias Tsitsimpis ]
+ * Remove cap on parallel builds, use `ggc-min-expand=10` instead
+ * Avoid virtual memory exhaustion on 32-bit unregisterised architectures
+ (Closes: #933968)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 30 Aug 2019 12:53:32 +0300
ghc (8.6.5+dfsg1-3) unstable; urgency=medium
=====================================
p/ghc/debian/rules
=====================================
@@ -56,11 +56,7 @@ ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
endif
%:
-ifneq (,$(filter s390x, $(DEB_HOST_ARCH)))
- dh $@ --max-parallel=2
-else
dh $@
-endif
override_dh_autoreconf:
@@ -82,20 +78,19 @@ else
echo "BUILD_SPHINX_HTML := NO" >> mk/build.mk
echo "BUILD_SPHINX_PDF := NO" >> mk/build.mk
endif
-ifneq (,$(filter arm64 armel armhf, $(DEB_HOST_ARCH)))
- echo "SRC_HC_OPTS += -optl-B/usr/bin/ld.gold" >> mk/build.mk
-endif
ifeq (armhf,$(DEB_HOST_ARCH))
echo "SRC_HC_OPTS += -D__ARM_PCS_VFP" >> mk/build.mk
endif
ifeq (big, $(DEB_TARGET_ARCH_ENDIAN))
+ # See https://gitlab.haskell.org/ghc/ghc/issues/16998
patch -p1 < debian/patches/Disable-unboxed-arrays.patch
endif
-ifneq (,$(filter mips mipsel, $(DEB_HOST_ARCH)))
+ifneq (,$(filter mips mipsel mips64el s390x, $(DEB_HOST_ARCH)))
echo "SRC_HC_OPTS += -optc--param -optcggc-min-expand=10" >> mk/build.mk
endif
ifneq (,$(filter mips64el, $(DEB_HOST_ARCH)))
- echo "SRC_HC_OPTS += -optc-mxgot" >> mk/build.mk
+ # Pass -mxgot to fix relocation linker errors
+ echo "compiler/hsSyn/HsInstances_HC_OPTS += -optc-mxgot" >> mk/build.mk
endif
ifeq (x32,$(DEB_HOST_ARCH))
echo "INTEGER_LIBRARY = integer-simple" >> mk/build.mk
@@ -115,6 +110,13 @@ ifneq (,$(filter noopt, $(DEB_BUILD_OPTIONS)))
# This breaks the build - to be investigated:
# echo "GhcLibHcOpts += -O0" >> mk/build.mk
echo "GhcRtsCcOpts += -O0" >> mk/build.mk
+endif
+ifneq (,$(filter mipsel hppa x32, $(DEB_HOST_ARCH)))
+ # Virtual memory exhausted when trying to build unregisterised compiler on
+ # 32-bit targets. Disable optimizations for compiler/hsSyn/HsInstances.hs.
+ # See https://bugs.debian.org/933968
+ # See https://gitlab.haskell.org/ghc/ghc/issues/17048
+ echo "compiler/hsSyn/HsInstances_HC_OPTS += -O0" >> mk/build.mk
endif
# We also want to build the threaded profiling-enabled debug runtime,
# because it does no harm
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/24a48d76b5a791dba8fae167d624207683b47353...aabcec2bbc070f0a22384d0286c1c805e73a9ede
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/24a48d76b5a791dba8fae167d624207683b47353...aabcec2bbc070f0a22384d0286c1c805e73a9ede
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/20190830/056a98cb/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list