[Git][haskell-team/DHG_packages][master] 28 commits: ghc: update to 9.2.5, drop patches now upstream, refresh patches.

Ilias Tsitsimpis (@iliastsi) gitlab at salsa.debian.org
Sat Aug 26 11:38:36 BST 2023



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


Commits:
d01b350a by Gianfranco Costamagna at 2022-11-29T10:43:06+01:00
ghc: update to 9.2.5, drop patches now upstream, refresh patches.
Upload to experimental

- - - - -
8349ec0d by Gianfranco Costamagna at 2022-11-29T21:27:25+01:00
ghc: Add upstream proposed patch to fix a build failure

- - - - -
27020a50 by Gianfranco Costamagna at 2023-03-16T19:24:20+01:00
ghc: update to 9.2.7-1~exp1

- - - - -
766b4e5b by Gianfranco Costamagna at 2023-04-20T09:53:00+02:00
ghc: switch to llvm-14 and add riscv64 to llvm-14 architectures

- - - - -
aaa5e00f by Gianfranco Costamagna at 2023-04-20T09:55:21+02:00
Merge branch 'master' into experimental

- - - - -
b0bd121e by Gianfranco Costamagna at 2023-04-20T12:27:59+02:00
ghc: Add upstream patch to allow llvm-14

- - - - -
a7604ea4 by Gianfranco Costamagna at 2023-04-24T15:09:04+02:00
ghc: don't use llvm on riscv64, not fixing the build failure

- - - - -
d633713e by Ilias Tsitsimpis at 2023-07-02T18:09:13+03:00
Merge branch 'master' into experimental

- - - - -
aab4b165 by Ilias Tsitsimpis at 2023-07-02T22:11:14+03:00
ghc: New upstream release

- - - - -
4f82eae3 by Ilias Tsitsimpis at 2023-07-05T18:23:09+03:00
ghc: Re-introduce 'fix-llvm-armel' patch

- - - - -
732de651 by Ilias Tsitsimpis at 2023-07-05T18:24:49+03:00
ghc: Drop 'Disable-unboxed-arrays' patch

- - - - -
5ffa2595 by Ilias Tsitsimpis at 2023-07-07T17:59:25+03:00
ghc: Build unregisterised on riscv64

- - - - -
b2d26315 by Ilias Tsitsimpis at 2023-07-07T19:12:24+03:00
ghc: Use libatomic in ghc-prim library

- - - - -
3a3d0f28 by Gianfranco Costamagna at 2023-08-01T09:24:24+02:00
ghc: try to lower parallel builds on mipsel

- - - - -
ef3fc329 by Ilias Tsitsimpis at 2023-08-11T19:46:06+03:00
Merge branch 'master' into experimental

- - - - -
b9f61783 by Ilias Tsitsimpis at 2023-08-11T20:16:23+03:00
ghc: New upstream release (9.4.6)

- - - - -
c41d5444 by Gianfranco Costamagna at 2023-08-18T09:00:26+02:00
Fix riscv64 build by not using rts

- - - - -
d9e39ac1 by Gianfranco Costamagna at 2023-08-18T09:00:26+02:00
haskell-versions: update changelog

- - - - -
06646e6c by Gianfranco Costamagna at 2023-08-18T09:00:26+02:00
haskell-lift-type: fix build on riscv64

- - - - -
424f82ec by Gianfranco Costamagna at 2023-08-18T09:01:21+02:00
haskell-hspec-hedgehog: disable RTS on riscv64

- - - - -
27d2366f by Gianfranco Costamagna at 2023-08-19T08:28:52+02:00
haskell-versions: upload to sid

- - - - -
627f56bd by Gianfranco Costamagna at 2023-08-19T08:32:04+02:00
haskell-lift-type: upload to sid

- - - - -
96c528e4 by Ilias Tsitsimpis at 2023-08-20T10:33:50+03:00
ghc: Use LLVM 16

- - - - -
2276c2d0 by Ilias Tsitsimpis at 2023-08-20T15:33:31+03:00
ghc: Backport patch for LLVM

- - - - -
125745f5 by Ilias Tsitsimpis at 2023-08-20T23:14:04+03:00
ghc: Fallback to LLVM 15

- - - - -
c6a0cdf7 by Gianfranco Costamagna at 2023-08-23T08:35:16+02:00
haskell-gi-vte: Fix build failure due to new at-spi2-common

- - - - -
5e900b5a by Gianfranco Costamagna at 2023-08-23T08:35:34+02:00
Merge branch 'master' into experimental

- - - - -
10f6d8ef by Ilias Tsitsimpis at 2023-08-25T20:13:00+03:00
ghc: Upload to unstable

- - - - -


27 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/control
- − p/ghc/debian/patches/00dc51060881df81258ba3b3bdf447294618a4de.patch
- − p/ghc/debian/patches/78db231ffdf8385662812781c1d09c630cfad313.patch
- p/ghc/debian/patches/ARM-VFPv3D16
- − p/ghc/debian/patches/Disable-unboxed-arrays.patch
- + p/ghc/debian/patches/build-fix-hs-constants.patch
- − p/ghc/debian/patches/buildpath-abi-stability-2.patch
- p/ghc/debian/patches/buildpath-abi-stability.patch
- − p/ghc/debian/patches/ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch
- + p/ghc/debian/patches/fix-bytestring-9.4.6
- + p/ghc/debian/patches/fix-index-html-removal
- p/ghc/debian/patches/fix-llvm-armel
- p/ghc/debian/patches/haddock-remove-googleapis-fonts
- p/ghc/debian/patches/kfreebsd-aclocal.m4
- − p/ghc/debian/patches/latomic-64bit
- − p/ghc/debian/patches/latomic-subword
- p/ghc/debian/patches/local-mathjax
- + p/ghc/debian/patches/newer-llvm
- p/ghc/debian/patches/no-missing-haddock-file-warning
- p/ghc/debian/patches/separate-docs
- p/ghc/debian/patches/series
- p/ghc/debian/patches/use-debian-gen_contents_index
- p/ghc/debian/patches/use-stage1-binaries-for-install.patch
- p/ghc/debian/patches/use-unbundled-sphinx-rtd-theme
- p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,99 @@
+ghc (9.4.6-1) unstable; urgency=medium
+
+  * Upload to unstable (Closes: #1017663, #1039474)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 25 Aug 2023 20:12:47 +0300
+
+ghc (9.4.6-1~exp4) experimental; urgency=medium
+
+  * Fallback to LLVM 15
+  * Do not depend on LLVM for arm64, it now has a native codegen
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 20 Aug 2023 23:13:59 +0300
+
+ghc (9.4.6-1~exp3) experimental; urgency=medium
+
+  * Backport upstream patch to use old pass manager in LLVM
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 20 Aug 2023 15:33:14 +0300
+
+ghc (9.4.6-1~exp2) experimental; urgency=medium
+
+  * Use LLVM 16
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 20 Aug 2023 10:33:37 +0300
+
+ghc (9.4.6-1~exp1) experimental; urgency=medium
+
+  * New upstream release
+  * Do not reduce parallelism on mipsel, as this doesn't fix OOM issues
+  * Drop 'ghc-prim-libatomic' patch, doesn't work
+  * Do not run inplace/bin/ghc-stage2 for cross-builds (Closes: #1042078)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 11 Aug 2023 19:52:02 +0300
+
+ghc (9.4.5-1~exp3) experimental; urgency=medium
+
+  * Try to reduce parallel builds on mipsel
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 01 Aug 2023 09:23:09 +0200
+
+ghc (9.4.5-1~exp2) experimental; urgency=medium
+
+  * Re-introduce 'fix-llvm-armel' patch
+  * Drop 'Disable-unboxed-arrays' patch, not needed any more
+  * Build unregisterised on riscv64
+  * Use libatomic in ghc-prim library
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 07 Jul 2023 19:12:19 +0300
+
+ghc (9.4.5-1~exp1) experimental; urgency=medium
+
+  [ Gianfranco Costamagna ]
+  * Don't use llvm on riscv64, doesn't fix the build
+
+  [ Ilias Tsitsimpis ]
+  * New upstream release
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 02 Jul 2023 18:10:44 +0300
+
+ghc (9.2.7-1~exp3) experimental; urgency=medium
+
+  * debian/patches/5fe11fe612e1881bd4d1b9d5950d0d801e08e159.patch:
+    - cherry-pick upstream patch to increase llvm upper bound to 15
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 20 Apr 2023 12:26:28 +0200
+
+ghc (9.2.7-1~exp2) experimental; urgency=medium
+
+  * Switch to llvm-14 and add riscv64 to llvm-* archs.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 20 Apr 2023 09:51:25 +0200
+
+ghc (9.2.7-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 16 Mar 2023 19:21:44 +0100
+
+ghc (9.2.5-1~exp2) experimental; urgency=medium
+
+  * build-fix-hs-constants.patch
+    - cherry-pick upstream proposed fix for build failure.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 29 Nov 2022 14:35:58 +0100
+
+ghc (9.2.5-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop patches now part of upstream codebase:
+    - buildpath-abi-stability-2.patch
+    - latomic-subword
+    - latomic-64bit
+  * Refresh patches
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 29 Nov 2022 10:29:14 +0100
+
 ghc (9.0.2-5) unstable; urgency=medium
 
   * Team upload.


=====================================
p/ghc/debian/control
=====================================
@@ -13,9 +13,9 @@ Build-Depends:
   devscripts,
   grep-dctrl,
   pkg-config,
-  ghc:native (>= 8.6),
+  ghc:native (>= 9.0),
   libgmp-dev,
-  llvm-13 [arm64 armel armhf],
+  llvm-15 [armel armhf],
   libffi-dev,
   libncurses-dev,
   python3-sphinx <!cross>,
@@ -32,7 +32,7 @@ Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/gh
 Package: ghc
 Architecture: any
 Depends:
-  llvm-13 [arm64 armel armhf],
+  llvm-15 [armel armhf],
   gcc,
   libgmp-dev,
   libffi-dev,
@@ -55,7 +55,7 @@ Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10), ${conflictin
 Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8)
 Breaks: cabal-install (<< 1.22), haskell-devscripts (<< 0.8.13),
  ghc-doc (<< 7.10), ghc-haddock (<< 7.10), ${conflicting-devs}
-Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-13
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-15
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.


=====================================
p/ghc/debian/patches/00dc51060881df81258ba3b3bdf447294618a4de.patch deleted
=====================================
@@ -1,44 +0,0 @@
-From 00dc51060881df81258ba3b3bdf447294618a4de Mon Sep 17 00:00:00 2001
-From: Matthew Pickering <matthewtpickering at gmail.com>
-Date: Tue, 3 Jan 2023 15:56:37 +0000
-Subject: [PATCH] sphinx: Use modern syntax for extlinks
-
-This fixes the following build error:
-
-```
-  Command line: /opt/homebrew/opt/sphinx-doc/bin/sphinx-build -b man -d /private/tmp/extra-dir-55768274273/.doctrees-man -n -w /private/tmp/extra-dir-55768274273/.log docs/users_guide /private/tmp/extra-dir-55768274273
-  ===> Command failed with error code: 2
-
-  Exception occurred:
-    File "/opt/homebrew/Cellar/sphinx-doc/6.0.0/libexec/lib/python3.11/site-packages/sphinx/ext/extlinks.py", line 101, in role
-      title = caption % part
-              ~~~~~~~~^~~~~~
-  TypeError: not all arguments converted during string formatting
-```
-
-I tested on Sphinx-5.1.1 and Sphinx-6.0.0
-
-Thanks for sterni for providing instructions about how to test using
-sphinx-6.0.0.
-
-Fixes #22690
----
- docs/users_guide/ghc_config.py.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in
-index dcc7fbaef62..c9888a13adc 100644
---- a/docs/users_guide/ghc_config.py.in
-+++ b/docs/users_guide/ghc_config.py.in
-@@ -1,6 +1,6 @@
- extlinks = {
--    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
--    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
-+    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '%s'),
-+    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
- }
- 
- libs_base_uri = '../libraries'
--- 
-GitLab
-


=====================================
p/ghc/debian/patches/78db231ffdf8385662812781c1d09c630cfad313.patch deleted
=====================================
@@ -1,24 +0,0 @@
-From 78db231ffdf8385662812781c1d09c630cfad313 Mon Sep 17 00:00:00 2001
-From: Cheng Shao <astrohavoc at gmail.com>
-Date: Thu, 27 Jan 2022 12:12:14 +0000
-Subject: [PATCH] configure: bump LlvmMaxVersion to 14
-
-LLVM 13.0.0 is released in Oct 2021, and latest head validates against
-LLVM 13 just fine if LlvmMaxVersion is bumped.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e8a95726a35..71879adeb04 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -681,7 +681,7 @@ AC_SUBST(InstallNameToolCmd)
- # versions of LLVM simultaneously, but that stopped working around
- # 3.5/3.6 release of LLVM.
- LlvmMinVersion=9  # inclusive
--LlvmMaxVersion=13 # not inclusive
-+LlvmMaxVersion=14 # not inclusive
- AC_SUBST([LlvmMinVersion])
- AC_SUBST([LlvmMaxVersion])
- sUPPORTED_LLVM_VERSION_MIN=$(echo \($LlvmMinVersion\) | sed 's/\./,/')


=====================================
p/ghc/debian/patches/ARM-VFPv3D16
=====================================
@@ -4,14 +4,13 @@ Description: Use VFPv3-D16 FPU for ARM builds
  for some reason.
 Author: Jani Monoses <jani at ubuntu.com>
 Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
-Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
 
-Index: b/m4/fptools.m4
+Index: b/m4/get_arm_isa.m4
 ===================================================================
---- a/m4/fptools.m4
-+++ b/m4/fptools.m4
-@@ -475,7 +475,7 @@ AC_DEFUN([GET_ARM_ISA],
-                 )],
+--- a/m4/get_arm_isa.m4
++++ b/m4/get_arm_isa.m4
+@@ -81,7 +81,7 @@ AC_DEFUN([GET_ARM_ISA],
+                 fi],
                  [changequote(, )dnl
                   ARM_ISA=ARMv7
 -                 ARM_ISA_EXT="[VFPv3,NEON]"


=====================================
p/ghc/debian/patches/Disable-unboxed-arrays.patch deleted
=====================================
@@ -1,13 +0,0 @@
-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/containers/include/containers.h
-+++ ghc-8.6.1/libraries/containers/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/patches/build-fix-hs-constants.patch
=====================================
@@ -0,0 +1,25 @@
+Origin: https://gitlab.haskell.org/ghc/ghc/-/issues/20287#note_422320
+Description: Fix build on all architectures.
+ exited with an error:
+ ghc: panic! (the 'impossible' happened)
+ (GHC version 9.2.0.20210821:
+ Couldn't find #define HS_CONSTANTS " in
+Index: b/compiler/GHC/Unit/State.hs
+===================================================================
+--- a/compiler/GHC/Unit/State.hs
++++ b/compiler/GHC/Unit/State.hs
+@@ -661,7 +661,13 @@ initUnits logger dflags cached_dbs home_
+       -- really need to use the platform constants but they have not been loaded.
+       case lookupUnitId unit_state rtsUnitId of
+         Nothing   -> return Nothing
+-        Just info -> lookupPlatformConstants (fmap ST.unpack (unitIncludeDirs info))
++        Just info ->
++          let
++            p :: String
++            p = topDir dflags ++ "/include"
++            ps :: [String]
++            ps = fmap ST.unpack (unitIncludeDirs info)
++          in lookupPlatformConstants (p : ps)
+ 
+   return (dbs,unit_state,home_unit,mconstants)
+ 


=====================================
p/ghc/debian/patches/buildpath-abi-stability-2.patch deleted
=====================================
@@ -1,87 +0,0 @@
-Description: Don't include BufPos in interface files
-Author: Matthew Pickering
-Origin: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8972
-Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/22162
-Index: b/compiler/GHC/Iface/Ext/Types.hs
-===================================================================
---- a/compiler/GHC/Iface/Ext/Types.hs
-+++ b/compiler/GHC/Iface/Ext/Types.hs
-@@ -746,5 +746,5 @@ toHieName name
-   | isKnownKeyName name = KnownKeyName (nameUnique name)
-   | isExternalName name = ExternalName (nameModule name)
-                                        (nameOccName name)
--                                       (nameSrcSpan name)
--  | otherwise = LocalName (nameOccName name) (nameSrcSpan name)
-+                                       (removeBufSpan $ nameSrcSpan name)
-+  | otherwise = LocalName (nameOccName name) (removeBufSpan $ nameSrcSpan name)
-Index: b/compiler/GHC/Types/SrcLoc.hs
-===================================================================
---- a/compiler/GHC/Types/SrcLoc.hs
-+++ b/compiler/GHC/Types/SrcLoc.hs
-@@ -72,6 +72,7 @@ module GHC.Types.SrcLoc (
-         getBufPos,
-         BufSpan(..),
-         getBufSpan,
-+        removeBufSpan,
- 
-         -- * Located
-         Located,
-@@ -397,6 +398,10 @@ data UnhelpfulSpanReason
-   | UnhelpfulOther !FastString
-   deriving (Eq, Show)
- 
-+removeBufSpan :: SrcSpan -> SrcSpan
-+removeBufSpan (RealSrcSpan s _) = RealSrcSpan s Nothing
-+removeBufSpan s = s
-+
- {- Note [Why Maybe BufPos]
- ~~~~~~~~~~~~~~~~~~~~~~~~~~
- In SrcLoc we store (Maybe BufPos); in SrcSpan we store (Maybe BufSpan).
-Index: b/compiler/GHC/Utils/Binary.hs
-===================================================================
---- a/compiler/GHC/Utils/Binary.hs
-+++ b/compiler/GHC/Utils/Binary.hs
-@@ -1444,19 +1444,6 @@ instance Binary RealSrcSpan where
-             return (mkRealSrcSpan (mkRealSrcLoc f sl sc)
-                                   (mkRealSrcLoc f el ec))
- 
--instance Binary BufPos where
--  put_ bh (BufPos i) = put_ bh i
--  get bh = BufPos <$> get bh
--
--instance Binary BufSpan where
--  put_ bh (BufSpan start end) = do
--    put_ bh start
--    put_ bh end
--  get bh = do
--    start <- get bh
--    end <- get bh
--    return (BufSpan start end)
--
- instance Binary UnhelpfulSpanReason where
-   put_ bh r = case r of
-     UnhelpfulNoLocationInfo -> putByte bh 0
-@@ -1475,10 +1462,11 @@ instance Binary UnhelpfulSpanReason wher
-       _ -> UnhelpfulOther <$> get bh
- 
- instance Binary SrcSpan where
--  put_ bh (RealSrcSpan ss sb) = do
-+  put_ bh (RealSrcSpan ss _sb) = do
-           putByte bh 0
-+          -- BufSpan doesn't ever get serialised because the positions depend
-+          -- on build location.
-           put_ bh ss
--          put_ bh sb
- 
-   put_ bh (UnhelpfulSpan s) = do
-           putByte bh 1
-@@ -1488,8 +1476,7 @@ instance Binary SrcSpan where
-           h <- getByte bh
-           case h of
-             0 -> do ss <- get bh
--                    sb <- get bh
--                    return (RealSrcSpan ss sb)
-+                    return (RealSrcSpan ss Nothing)
-             _ -> do s <- get bh
-                     return (UnhelpfulSpan s)
- 


=====================================
p/ghc/debian/patches/buildpath-abi-stability.patch
=====================================
@@ -4,21 +4,21 @@ Index: b/compiler/GHC/Iface/Recomp.hs
 ===================================================================
 --- a/compiler/GHC/Iface/Recomp.hs
 +++ b/compiler/GHC/Iface/Recomp.hs
-@@ -1071,7 +1071,7 @@ addFingerprints hsc_env iface0
-    iface_hash <- computeFingerprint putNameLiterally
+@@ -1234,7 +1234,7 @@ addFingerprints hsc_env iface0
                        (mod_hash,
+                        mi_src_hash iface0,
                         ann_fn (mkVarOcc "module"),  -- See mkIfaceAnnCache
 -                       mi_usages iface0,
 +                       usages,
                         sorted_deps,
                         mi_hpc iface0)
  
-@@ -1106,6 +1106,8 @@ addFingerprints hsc_env iface0
+@@ -1269,6 +1269,8 @@ addFingerprints hsc_env iface0
      (non_orph_rules, orph_rules) = mkOrphMap ifRuleOrph    (mi_rules iface0)
      (non_orph_fis,   orph_fis)   = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
      ann_fn = mkIfaceAnnCache (mi_anns iface0)
 +    -- Do not allow filenames to affect the interface
-+    usages = [ case u of UsageFile _ fp -> UsageFile "" fp; _ -> u | u <- mi_usages iface0 ]
++    usages = [ case u of UsageFile _ fp fl -> UsageFile "" fp fl; _ -> u | u <- mi_usages iface0 ]
  
  -- | Retrieve the orphan hashes 'mi_orphan_hash' for a list of modules
  -- (in particular, the orphan modules which are transitively imported by the


=====================================
p/ghc/debian/patches/ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8 Mon Sep 17 00:00:00 2001
-From: Ben Gamari <ben at smart-cactus.org>
-Date: Fri, 29 Apr 2022 12:51:26 -0400
-Subject: [PATCH] Update supported LLVM versions
-
-Pull forward minimum version to match 9.2.
-
-(cherry picked from commit c26faa54c5fbe902ccb74e79d87e3fa705e270d1)
----
- configure.ac                     | 2 +-
- docs/users_guide/9.4.1-notes.rst | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f0d3160d1f7..0fd6442d51b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -555,7 +555,7 @@ AC_SUBST(InstallNameToolCmd)
- # tools we are looking for. In the past, GHC supported a number of
- # versions of LLVM simultaneously, but that stopped working around
- # 3.5/3.6 release of LLVM.
--LlvmMinVersion=9  # inclusive
-+LlvmMinVersion=10  # inclusive
- LlvmMaxVersion=14 # not inclusive
- AC_SUBST([LlvmMinVersion])
- AC_SUBST([LlvmMaxVersion])


=====================================
p/ghc/debian/patches/fix-bytestring-9.4.6
=====================================
@@ -0,0 +1,28 @@
+From 2bdeb7b0e7dd100fce9e1f4d1ecf1cd6b5b9702c Mon Sep 17 00:00:00 2001
+From: Matthew Craven <clyring at gmail.com>
+Date: Tue, 8 Aug 2023 14:25:03 -0400
+Subject: [PATCH] Use a more specific include than Rts.h (#607)
+
+The Rts.h include seems to cause build problems.
+See also:
+  https://gitlab.haskell.org/ghc/ghc/-/issues/23789
+  https://github.com/haskell/bytestring/issues/606
+
+(cherry picked from commit e8a9b522063a203424eac3357873e4a8f2a09965)
+---
+ cbits/is-valid-utf8.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/libraries/bytestring/cbits/is-valid-utf8.c
+===================================================================
+--- a/libraries/bytestring/cbits/is-valid-utf8.c
++++ b/libraries/bytestring/cbits/is-valid-utf8.c
+@@ -50,7 +50,7 @@ SUCH DAMAGE.
+ #endif
+ 
+ #include <MachDeps.h>
+-#include "Rts.h"
++#include "ghcplatform.h"
+ 
+ #ifdef WORDS_BIGENDIAN
+ #define to_little_endian(x) __builtin_bswap64(x)


=====================================
p/ghc/debian/patches/fix-index-html-removal
=====================================
@@ -0,0 +1,18 @@
+Description: Do not remove docs/index.html
+ Commit 9ddda31cd3a208411c642d8c081207718782f80c changed ./configure
+ which now doesn't generate the docs/index.html file, but forgot to
+ modify the 'distclean' rule to not remove this file.
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+
+Index: b/ghc.mk
+===================================================================
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -1460,7 +1460,6 @@ distclean : clean
+ 	$(call removeFiles,docs/users_guide/ug-book.xml)
+ 	$(call removeFiles,docs/users_guide/ug-ent.xml)
+ 	$(call removeFiles,docs/users_guide/ghc_config.py)
+-	$(call removeFiles,docs/index.html)
+ 	$(call removeFiles,libraries/prologue.txt)
+ 	$(call removeFiles,distrib/configure.ac)
+ 	$(call removeFiles,ch01.html ch02.html index.html)


=====================================
p/ghc/debian/patches/fix-llvm-armel
=====================================
@@ -14,15 +14,15 @@ Description: Fix LLVM error on armel
  thie error.
 Author: Ilias Tsitsimpis <iliastsi at debian.org>
 Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/20285
-Index: b/includes/CodeGen.Platform.hs
+Index: b/compiler/CodeGen.Platform.h
 ===================================================================
---- a/includes/CodeGen.Platform.hs
-+++ b/includes/CodeGen.Platform.hs
+--- a/compiler/CodeGen.Platform.h
++++ b/compiler/CodeGen.Platform.h
 @@ -6,6 +6,7 @@ import GHC.Utils.Panic.Plain
  #endif
  import GHC.Platform.Reg
  
 +#include "ghcautoconf.h"
- #include "stg/MachRegs.h"
+ #include "MachRegs.h"
  
  #if defined(MACHREGS_i386) || defined(MACHREGS_x86_64)


=====================================
p/ghc/debian/patches/haddock-remove-googleapis-fonts
=====================================
@@ -6,7 +6,7 @@ Index: b/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
 ===================================================================
 --- a/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
 +++ b/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
-@@ -137,7 +137,7 @@ headHtml docTitle themes mathjax_url bas
+@@ -145,7 +145,7 @@ headHtml docTitle themes mathjax_url bas
                  , thetype "text/css"
                  , href (withBaseURL base_url quickJumpCssFile) ]
               << noHtml
@@ -15,7 +15,7 @@ Index: b/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
      , script ! [ src (withBaseURL base_url haddockJsFile)
                 , emptyAttr "async"
                 , thetype "text/javascript" ]
-@@ -146,7 +146,7 @@ headHtml docTitle themes mathjax_url bas
+@@ -154,7 +154,7 @@ headHtml docTitle themes mathjax_url bas
      , script ! [src mjUrl, thetype "text/javascript"] << noHtml
      ]
    where


=====================================
p/ghc/debian/patches/kfreebsd-aclocal.m4
=====================================
@@ -2,20 +2,20 @@ Description: Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
 Author: Svante Signell <svante.signell at gmail.com>
 Bug-Debian: https://bugs.debian.org/913140
 
-Index: b/m4/fptools.m4
+Index: b/m4/ghc_convert_os.m4
 ===================================================================
---- a/m4/fptools.m4
-+++ b/m4/fptools.m4
-@@ -2144,7 +2144,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
-         $3="openbsd"
+--- a/m4/ghc_convert_os.m4
++++ b/m4/ghc_convert_os.m4
+@@ -26,7 +26,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
+         $3="mingw32"
          ;;
        # As far as I'm aware, none of these have relevant variants
--      freebsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
-+      freebsd|dragonfly|hpux|linuxaout|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
+-      freebsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
++      freebsd|dragonfly|hpux|linuxaout|freebsd2|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
          $3="$1"
          ;;
        msys)
-@@ -2164,6 +2164,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
+@@ -46,6 +46,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
                  #      i686-gentoo-freebsd8.2
          $3="freebsd"
          ;;


=====================================
p/ghc/debian/patches/latomic-64bit deleted
=====================================
@@ -1,82 +0,0 @@
-Description: Use libatomic for 64-bit operations
- The rts package uses GCC's __atomic built-in functions on 64-bit values. This
- is not supported on some 32bit platforms (e.g., mipsel) resulting in the
- following compilation error:
-
-   rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_load_8'
-   rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_store_8'
-   rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_fetch_add_8'
-
- Fix this by linking against libatomic.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/20549
-Forwarded: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6820
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1286,12 +1286,11 @@ AC_LINK_IFELSE([
-   AC_MSG_RESULT(no)
- )
- 
-+need_latomic=0
- AC_MSG_CHECKING(whether -latomic is needed for sub-word-sized atomic operations)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
-     [
-         AC_MSG_RESULT(no)
--        AC_SUBST([CabalNeedLibatomic],[False])
--        need_latomic=0
-     ],
-     [
-         _save_LIBS=$LIBS
-@@ -1299,18 +1298,46 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsign
-         AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
-             [
-                 AC_MSG_RESULT(yes)
--                AC_SUBST([CabalNeedLibatomic],[True])
-                 need_latomic=1
-             ],
-             [
--                AC_SUBST([CabalNeedLibatomic],[False])
-                 AC_MSG_ERROR([sub-word-sized atomic operations not available.])
--                need_latomic=0
-             ])
-         LIBS=$_save_LIBS
-     ])
-+AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic operations)
-+AC_LINK_IFELSE([AC_LANG_PROGRAM(
-+        [[
-+        #include <inttypes.h>
-+        uint64_t a;
-+        ]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
-+    [
-+        AC_MSG_RESULT(no)
-+    ],
-+    [
-+        _save_LIBS=$LIBS
-+        LIBS="-latomic"
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM(
-+                [[
-+                #include <inttypes.h>
-+                uint64_t a;
-+                ]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
-+            [
-+                AC_MSG_RESULT(yes)
-+                need_latomic=1
-+            ],
-+            [
-+                AC_MSG_ERROR([64-bit atomic operations not available.])
-+            ])
-+        LIBS=$_save_LIBS
-+    ])
-+if test $need_latomic = 1; then
-+    AC_SUBST([CabalNeedLibatomic],[True])
-+else
-+    AC_SUBST([CabalNeedLibatomic],[False])
-+fi
- AC_DEFINE_UNQUOTED([NEED_ATOMIC_LIB], [$need_latomic],
--    [Define to 1 if we need -latomic for sub-word atomic operations.])
-+    [Define to 1 if we need -latomic.])
- 
- dnl ** check for eventfd which is needed by the I/O manager
- AC_CHECK_HEADERS([sys/eventfd.h])


=====================================
p/ghc/debian/patches/latomic-subword deleted
=====================================
@@ -1,85 +0,0 @@
-commit 90f06a0e015e18c066fe1569fb2add318bec72ca
-Author: Haochen Tong <i at hexchain.org>
-Date:   Mon Oct 11 11:40:56 2021 +0800
-
-    Check for libatomic dependency for atomic operations
-    
-    Some platforms (e.g. RISC-V) require linking against libatomic for some
-    (e.g. sub-word-sized) atomic operations.
-    
-    Fixes #19119.
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1286,6 +1286,32 @@ AC_LINK_IFELSE([
-   AC_MSG_RESULT(no)
- )
- 
-+AC_MSG_CHECKING(whether -latomic is needed for sub-word-sized atomic operations)
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
-+    [
-+        AC_MSG_RESULT(no)
-+        AC_SUBST([CabalNeedLibatomic],[False])
-+        need_latomic=0
-+    ],
-+    [
-+        _save_LIBS=$LIBS
-+        LIBS="-latomic"
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
-+            [
-+                AC_MSG_RESULT(yes)
-+                AC_SUBST([CabalNeedLibatomic],[True])
-+                need_latomic=1
-+            ],
-+            [
-+                AC_SUBST([CabalNeedLibatomic],[False])
-+                AC_MSG_ERROR([sub-word-sized atomic operations not available.])
-+                need_latomic=0
-+            ])
-+        LIBS=$_save_LIBS
-+    ])
-+AC_DEFINE_UNQUOTED([NEED_ATOMIC_LIB], [$need_latomic],
-+    [Define to 1 if we need -latomic for sub-word atomic operations.])
-+
- dnl ** check for eventfd which is needed by the I/O manager
- AC_CHECK_HEADERS([sys/eventfd.h])
- AC_CHECK_FUNCS([eventfd])
-Index: b/rts/package.conf.in
-===================================================================
---- a/rts/package.conf.in
-+++ b/rts/package.conf.in
-@@ -63,6 +63,9 @@ extra-libraries:
-                              , "elf"
-                              , "dw"             /* for backtraces */
- #endif
-+#if NEED_ATOMIC_LIB
-+                             , "atomic"
-+#endif
- 
- #if defined(INSTALLING)
- include-dirs:           INCLUDE_DIR FFI_INCLUDE_DIR
-Index: b/rts/rts.cabal.in
-===================================================================
---- a/rts/rts.cabal.in
-+++ b/rts/rts.cabal.in
-@@ -20,6 +20,8 @@ flag libbfd
-   default: @CabalHaveLibbfd@
- flag mingwex
-   default: @CabalMingwex@
-+flag need-atomic
-+  default: @CabalNeedLibatomic@
- flag libdw
-   default: @CabalHaveLibdw@
- flag libnuma
-@@ -126,6 +128,9 @@ library
-     if flag(need-pthread)
-        -- for pthread_getthreadid_np, pthread_create, ...
-        extra-libraries: pthread
-+    if flag(need-atomic)
-+       -- for sub-word-sized atomic operations (#19119)
-+       extra-libraries: atomic
-     if flag(libbfd)
-        -- for debugging
-        extra-libraries: bfd iberty


=====================================
p/ghc/debian/patches/local-mathjax
=====================================
@@ -2,11 +2,11 @@ Index: b/docs/users_guide/conf.py
 ===================================================================
 --- a/docs/users_guide/conf.py
 +++ b/docs/users_guide/conf.py
-@@ -74,7 +74,7 @@ html_use_opensearch = 'https://downloads
+@@ -75,7 +75,7 @@ html_use_opensearch = 'https://downloads
  html_show_copyright = True
  
- # See GHC #15006
--mathjax_path = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js'
+ # See GHC #15006, #19423
+-mathjax_path = 'https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLorMML '
 +mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js'
  
  # If true, an OpenSearch description file will be output, and all pages will


=====================================
p/ghc/debian/patches/newer-llvm
=====================================
@@ -0,0 +1,46 @@
+commit 0cc16aaf89d7dc3963764b7193ceac73e4e3329b
+Author: Matthew Pickering <matthewtpickering at gmail.com>
+Date:   Mon Jan 30 10:58:12 2023 +0000
+
+    Bump supported LLVM range from 10 through 15 to 11 through 16
+    
+    LLVM 15 turns on the new pass manager by default, which we have yet to
+    migrate to so for new we pass the `-enable-new-pm-0` flag in our
+    llvm-passes flag.
+    
+    LLVM 11 was the first version to support the `-enable-new-pm` flag so we
+    bump the lowest supported version to 11.
+    
+    Our CI jobs are using LLVM 12 so they should continue to work despite
+    this bump to the lower bound.
+    
+    Fixes #21936
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -581,8 +581,8 @@ AC_SUBST(InstallNameToolCmd)
+ # tools we are looking for. In the past, GHC supported a number of
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+-LlvmMinVersion=10  # inclusive
+-LlvmMaxVersion=15 # not inclusive
++LlvmMinVersion=11  # inclusive
++LlvmMaxVersion=16 # not inclusive
+ AC_SUBST([LlvmMinVersion])
+ AC_SUBST([LlvmMaxVersion])
+ sUPPORTED_LLVM_VERSION_MIN=$(echo \($LlvmMinVersion\) | sed 's/\./,/')
+Index: b/llvm-passes
+===================================================================
+--- a/llvm-passes
++++ b/llvm-passes
+@@ -1,5 +1,5 @@
+ [
+-(0, "-mem2reg -globalopt -lower-expect"),
+-(1, "-O1 -globalopt"),
+-(2, "-O2")
++(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"),
++(1, "-enable-new-pm=0 -O1 -globalopt"),
++(2, "-enable-new-pm=0 -O2")
+ ]


=====================================
p/ghc/debian/patches/no-missing-haddock-file-warning
=====================================
@@ -7,7 +7,7 @@ Index: b/utils/ghc-pkg/Main.hs
 ===================================================================
 --- a/utils/ghc-pkg/Main.hs
 +++ b/utils/ghc-pkg/Main.hs
-@@ -1875,8 +1875,10 @@ checkPackageConfig pkg verbosity db_stac
+@@ -1923,8 +1923,10 @@ checkPackageConfig pkg verbosity db_stac
    mapM_ (checkDir True  "dynamic-library-dirs") (libraryDynDirs pkg)
    mapM_ (checkDir True  "include-dirs") (includeDirs pkg)
    mapM_ (checkDir True  "framework-dirs") (frameworkDirs pkg)


=====================================
p/ghc/debian/patches/separate-docs
=====================================
@@ -2,7 +2,7 @@ Index: b/ghc.mk
 ===================================================================
 --- a/ghc.mk
 +++ b/ghc.mk
-@@ -802,7 +802,7 @@ endif
+@@ -869,7 +869,7 @@ endif
  ifeq "$(HADDOCK_DOCS)" "YES"
  libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
  ifeq "$(phase)" "final"
@@ -11,7 +11,7 @@ Index: b/ghc.mk
  endif
  INSTALL_LIBRARY_DOCS += libraries/dist-haddock/*
  endif
-@@ -844,9 +844,9 @@ libraries/ghc-prim/dist-install/build/au
+@@ -919,9 +919,9 @@ libraries/ghc-prim/dist-install/build/au
  
  install: install_libs install_packages install_libexecs \
           install_bins install_libexec_scripts


=====================================
p/ghc/debian/patches/series
=====================================
@@ -2,17 +2,15 @@ use-debian-gen_contents_index
 ARM-VFPv3D16
 no-missing-haddock-file-warning
 buildpath-abi-stability.patch
-buildpath-abi-stability-2.patch
 x32-use-native-x86_64-insn.patch
 use-stage1-binaries-for-install.patch
 kfreebsd-aclocal.m4
 local-mathjax
 haddock-remove-googleapis-fonts
-fix-llvm-armel
-latomic-subword
-latomic-64bit
-78db231ffdf8385662812781c1d09c630cfad313.patch
-ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch
 separate-docs
-00dc51060881df81258ba3b3bdf447294618a4de.patch
+build-fix-hs-constants.patch
+fix-index-html-removal
+fix-llvm-armel
 use-unbundled-sphinx-rtd-theme
+fix-bytestring-9.4.6
+newer-llvm


=====================================
p/ghc/debian/patches/use-debian-gen_contents_index
=====================================
@@ -2,7 +2,7 @@ Index: b/ghc.mk
 ===================================================================
 --- a/ghc.mk
 +++ b/ghc.mk
-@@ -801,7 +801,6 @@ endif
+@@ -868,7 +868,6 @@ endif
  # Build the Haddock contents and index
  ifeq "$(HADDOCK_DOCS)" "YES"
  libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
@@ -10,7 +10,7 @@ Index: b/ghc.mk
  ifeq "$(phase)" "final"
  $(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
  endif
-@@ -933,12 +932,8 @@ endif
+@@ -1008,12 +1007,8 @@ endif
  	$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
  	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
  ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -24,7 +24,7 @@ Index: b/ghc.mk
  endif
  ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
  	for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -1061,7 +1056,6 @@ $(eval $(call bindist-list,.,\
+@@ -1138,7 +1133,6 @@ $(eval $(call bindist-list,.,\
      mk/project.mk \
      mk/install.mk.in \
      bindist.mk \


=====================================
p/ghc/debian/patches/use-stage1-binaries-for-install.patch
=====================================
@@ -11,7 +11,7 @@ Index: b/ghc.mk
 ===================================================================
 --- a/ghc.mk
 +++ b/ghc.mk
-@@ -952,8 +952,12 @@ else # CrossCompiling
+@@ -1032,8 +1032,12 @@ else # CrossCompiling
  # Install packages in the right order, so that ghc-pkg doesn't complain.
  # Also, install ghc-pkg first.
  ifeq "$(Windows_Host)" "NO"


=====================================
p/ghc/debian/patches/use-unbundled-sphinx-rtd-theme
=====================================
@@ -2,7 +2,7 @@ Index: b/docs/users_guide/conf.py
 ===================================================================
 --- a/docs/users_guide/conf.py
 +++ b/docs/users_guide/conf.py
-@@ -65,7 +65,7 @@ exclude_patterns = ['.build']
+@@ -66,7 +66,7 @@ exclude_patterns = ['.build']
  html_title = "Glasgow Haskell Compiler %s User's Guide" % release
  html_short_title = "GHC %s User's Guide" % release
  html_theme_path = ['.']


=====================================
p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
=====================================
@@ -16,7 +16,7 @@ Index: b/rts/RtsSymbols.c
 ===================================================================
 --- a/rts/RtsSymbols.c
 +++ b/rts/RtsSymbols.c
-@@ -1010,7 +1010,7 @@ extern char **environ;
+@@ -935,7 +935,7 @@ extern char **environ;
  
  
  // 64-bit support functions in libgcc.a


=====================================
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 i386 powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
+ifneq (,$(filter i386 powerpcspe x32 s390x riscv64, $(DEB_HOST_ARCH)))
   # From GHC 8.10 and later, native code generator support for legacy x87
   # floating point coprocessor has been removed. GHC now only support floating
   # point via SSE2. This causes a baseline violation on Debian for i386 where
@@ -47,13 +47,6 @@ 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
@@ -69,7 +62,7 @@ endif
 	dh $@
 
 override_dh_autoreconf:
-	dh_autoreconf perl -- boot
+	dh_autoreconf ./boot.source
 
 override_dh_auto_configure:
 	echo "SRC_HC_OPTS += -lffi -optl-pthread" >> mk/build.mk
@@ -94,10 +87,6 @@ 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 powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
 	# From Fedora
 	patch -p1 < debian/patches/ghc-warnings.mk-CC-Wall.patch
@@ -139,6 +128,13 @@ endif
 	# because it does no harm
 	echo 'GhcRTSWays += $$(if $$(filter p, $$(GhcLibWays)),thr_debug_p,)' >> mk/build.mk
 
+	# The make build system is completely broken at this point, since it
+	# doesn't pass the '-build-tool-depends' flag (as Handrian does) and require
+	# alex/happy to build from a release tarball.
+	echo 'utils/genprimopcode_CONFIGURE_OPTS += "-f-build-tool-depends"' >> mk/build.mk
+	echo 'compiler_CONFIGURE_OPTS += "-f-build-tool-depends"' >> mk/build.mk
+	echo 'utils/hpc_CONFIGURE_OPTS += "-f-build-tool-depends"' >> mk/build.mk
+
 	# We can't do this with a configure flag in 6.8.1 as libdir is not
 	# defined at the point at which we := it
 	echo 'ghclibdir := $${libdir}/ghc' >> mk/build.mk
@@ -210,9 +206,11 @@ override_dh_auto_install-arch:
 	sed -ri 's,/usr/share/doc/ghc-doc/html/libraries/(.*)\.haddock,/usr/lib/ghc-doc/haddock/ghc/\1.haddock,' debian/tmp/var/lib/ghc/package.conf.d/*.conf
 
 	# Sort out the binaries
+ifeq (NO,$(BUILD_CROSS))
 	if inplace/bin/ghc-stage2 --info | grep '"Have interpreter","NO"'; then \
 	    cd debian/tmp/usr/bin ;rm -f ghci* runghc* runhaskell*; \
 	fi
+endif
 
 	# manpages
 	echo ".so man1/ghc.1" > debian/tmp/usr/share/man/man1/ghc-$(ProjectVersion).1



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/72e6b1332826f56c581712263b65fb0e04088d3f...10f6d8effe3fcfdab46635ad74bbec467fb4467a

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/72e6b1332826f56c581712263b65fb0e04088d3f...10f6d8effe3fcfdab46635ad74bbec467fb4467a
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/20230826/996f8640/attachment-0001.htm>


More information about the Pkg-haskell-commits mailing list