[Git][haskell-team/DHG_packages][master] ghc: Build unregisterised on powerpc

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
1efc5431 by Ilias Tsitsimpis at 2024-04-11T21:45:25+03:00
ghc: Build unregisterised on powerpc

- - - - -


2 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -2,6 +2,7 @@ ghc (9.4.7-5) unstable; urgency=medium
 
   * Backport upstream patches to fix issues with 64-bit time_t (Closes:
     #1068586)
+  * Build unregisterised on powerpc (Closes: #1060196)
 
  -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 10 Apr 2024 14:24:01 +0300
 


=====================================
p/ghc/debian/rules
=====================================
@@ -16,7 +16,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)
+export DEB_TARGET_ARCH_ENDIAN  ?= $(shell dpkg-architecture -qDEB_TARGET_ARCH_ENDIAN)
 
 # Bootstrap GHC
 export GHC := $(firstword $(shell bash -c "type -p ghc"))
@@ -60,6 +60,12 @@ ifneq (,$(filter i386 powerpcspe x32, $(DEB_HOST_ARCH)))
   EXTRA_CONFIGURE_FLAGS += --enable-unregisterised
 endif
 
+# See https://bugs.debian.org/1060196
+ifneq (,$(filter powerpc, $(DEB_HOST_ARCH)))
+  EXTRA_CONFIGURE_FLAGS += --enable-unregisterised
+  EXTRA_HADRIAN_FLAGS += "*.*.ghc.hs.opts += -optc--param -optcggc-min-expand=10 -optc-O3"
+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
@@ -73,11 +79,11 @@ ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
 endif
 
 ifneq (,$(filter armhf, $(DEB_HOST_ARCH)))
-	EXTRA_HADRIAN_FLAGS += "*.*.ghc.hs.opts += -D__ARM_PCS_VFP"
+  EXTRA_HADRIAN_FLAGS += "*.*.ghc.hs.opts += -D__ARM_PCS_VFP"
 endif
 
 ifneq (,$(filter i386 mips mipsel hppa, $(DEB_HOST_ARCH)))
-	EXTRA_HADRIAN_FLAGS += "*.*.ghc.hs.opts += -optc--param -optcggc-min-expand=10"
+  EXTRA_HADRIAN_FLAGS += "*.*.ghc.hs.opts += -optc--param -optcggc-min-expand=10"
 endif
 
 # mips64el compiles fine without it. Keep this commented out in
@@ -88,16 +94,16 @@ endif
 # endif
 
 ifneq (,$(filter x32, $(DEB_HOST_ARCH)))
-	EXTRA_HADRIAN_FLAGS += --integer-simple
+  EXTRA_HADRIAN_FLAGS += --integer-simple
 endif
 
 ifneq (,$(filter noopt, $(DEB_BUILD_OPTIONS)))
-	EXTRA_HADRIAN_FLAGS += "*.*.ghc.*.opts += -H64m -O0"
-	EXTRA_HADRIAN_FLAGS += "*.*.rts.*.opts += -O0"
+  EXTRA_HADRIAN_FLAGS += "*.*.ghc.*.opts += -H64m -O0"
+  EXTRA_HADRIAN_FLAGS += "*.*.rts.*.opts += -O0"
 endif
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
 # Use system libffi



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/1efc543194a594d71e497cc6e72fbcd699828e0f
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/20240412/8f0226ce/attachment-0001.htm>