[Git][haskell-team/DHG_packages][experimental] 3 commits: ghc: add patch from Fedora to suppress build warnings on s390x architecture,...

[Gianfranco Costamagna (@locutusofborg)]

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


Commits:
9289b99a by Gianfranco Costamagna at 2021-08-26T15:31:24+02:00
ghc: add patch from Fedora to suppress build warnings on s390x architecture, making the log too huge to be viewable

- - - - -
2bc1dfc1 by Gianfranco Costamagna at 2021-08-26T15:31:24+02:00
ghc: apply patch only on s390x architecture for now

- - - - -
6b295d6e by Gianfranco Costamagna at 2021-08-26T15:31:24+02:00
ghc: update changelog

- - - - -


3 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/ghc-warnings.mk-CC-Wall.patch
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+ghc (8.10.6-1~exp3) UNRELEASED; urgency=medium
+
+  * Drop some patches now upstream.
+  * Add a patch from Fedora to avoid too much logs on s390x.
+  * Enable unregisterised builds on s390x
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 26 Aug 2021 12:00:34 +0200
+
 ghc (8.10.6-1~exp2) experimental; urgency=medium
 
   * New upstream version.


=====================================
p/ghc/debian/patches/ghc-warnings.mk-CC-Wall.patch
=====================================
@@ -0,0 +1,12 @@
+--- ghc-8.4.3/mk/warnings.mk~	2018-02-04 02:30:11.000000000 +0900
++++ ghc-8.4.3/mk/warnings.mk	2018-09-29 14:33:37.607884921 +0900
+@@ -1,6 +1,6 @@
+ # See Note [Order of warning flags].
+-SRC_CC_OPTS     += -Wall $(WERROR)
++#SRC_CC_OPTS     += -Wall $(WERROR)
+ SRC_HC_OPTS     += -Wall
+ # Don't add -Werror to SRC_HC_OPTS_STAGE0 (or SRC_HC_OPTS), because otherwise
+ # validate may unnecessarily fail when booting with an older compiler.
+ # It would be better to only exclude certain warnings from becoming errors
+
+Diff finished.  Sat Sep 29 14:35:43 2018


=====================================
p/ghc/debian/rules
=====================================
@@ -39,7 +39,7 @@ export GHC=$(firstword $(shell bash -c "type -p ghc"))
 
 DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
 
-ifneq (,$(filter powerpcspe x32, $(DEB_HOST_ARCH)))
+ifneq (,$(filter powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
   EXTRA_CONFIGURE_FLAGS += --enable-unregisterised
 endif
 
@@ -91,6 +91,10 @@ 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 powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
+	# From Fedora
+	patch -p1 < debian/patches/ghc-warnings.mk-CC-Wall.patch
+endif
 ifneq (,$(filter mips mipsel s390x, $(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/3e24bed70cb47cb8576e1282e1f52c4777012f87...6b295d6e2553bba60dbd1eba837099e127882b2b

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/3e24bed70cb47cb8576e1282e1f52c4777012f87...6b295d6e2553bba60dbd1eba837099e127882b2b
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/20210826/4c1a2267/attachment-0001.htm>