[Git][haskell-team/DHG_packages][experimental] 9.8.4 WIP to experimental

[Clint Adams (@clint)]

Clint Adams pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
a77bf04d by Clint Adams at 2025-09-14T09:39:21-04:00
9.8.4 WIP to experimental

- - - - -


4 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/control
- p/ghc/debian/patches/0002-llvmGen-Allow-LlvmLits-in-MetaExprs.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,4 +1,4 @@
-ghc (9.8.4-1~exp1) UNRELEASED; urgency=medium
+ghc (9.8.4-0~0exp1) experimental; urgency=medium
 
   * New upstream release.
   * Switch to llvm-19
@@ -11,15 +11,15 @@ ghc (9.8.4-1~exp1) UNRELEASED; urgency=medium
     - llvm-new-pass-manager
     - pr-13096
 
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 18 Dec 2024 23:45:33 +0100
-
-ghc (9.6.6-5) UNRELEASED; urgency=medium
-
   [ fanpeng <fanpeng at loongson.cn> ]
   * Pass the mcmodel=medium parameter to CC via GHC
     (Closes: #1101273)
 
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 25 Mar 2025 10:42:14 +0100
+  [ Clint Adams ]
+  * Build-Depend on hadrian 9.8.4.
+  * Patch hp2ps for C23 compatibility.
+
+ -- Clint Adams <clint at debian.org>  Fri, 12 Sep 2025 10:06:48 -0400
 
 ghc (9.6.6-4) unstable; urgency=medium
 


=====================================
p/ghc/debian/control
=====================================
@@ -5,18 +5,18 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.or
 Uploaders:
  Clint Adams <clint at debian.org>,
  Ilias Tsitsimpis <iliastsi at debian.org>
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Build-Depends:
   debhelper-compat (= 12),
-  haskell-devscripts-minimal (>= 0.16.31) <!cross>,
+  haskell-devscripts-minimal (>= 0.16.35) <!cross>,
   binutils-gold [armel armhf],
   gcc,
   g++,
   pkg-config,
   ghc:native (>= 9.2),
-  hadrian:native (>= 9.6.6) <!pkg.ghc.nohadrian>,
-  hadrian:native (<< 9.6.7~) <!pkg.ghc.nohadrian>,
+  hadrian:native (>= 9.8.4~) <!pkg.ghc.nohadrian>,
+  hadrian:native (<< 9.8.5~) <!pkg.ghc.nohadrian>,
   llvm-19 [armel armhf s390x riscv64 loong64],
   libgmp-dev,
   libffi-dev,


=====================================
p/ghc/debian/patches/0002-llvmGen-Allow-LlvmLits-in-MetaExprs.patch
=====================================
@@ -9,11 +9,9 @@ Subject: [PATCH] llvmGen: Allow LlvmLits in MetaExprs
  compiler/GHC/Llvm/Ppr.hs      | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/compiler/GHC/Llvm/MetaData.hs b/compiler/GHC/Llvm/MetaData.hs
-index 8f1ba411..5d0a996c 100644
 --- a/compiler/GHC/Llvm/MetaData.hs
 +++ b/compiler/GHC/Llvm/MetaData.hs
-@@ -77,6 +77,7 @@ instance Outputable MetaId where
+@@ -79,6 +79,7 @@ ppMetaId (MetaId n) = char '!' <> int n
  
  -- | LLVM metadata expressions
  data MetaExpr = MetaStr !LMString
@@ -21,18 +19,13 @@ index 8f1ba411..5d0a996c 100644
                | MetaNode !MetaId
                | MetaVar !LlvmVar
                | MetaStruct [MetaExpr]
-diff --git a/compiler/GHC/Llvm/Ppr.hs b/compiler/GHC/Llvm/Ppr.hs
-index 787b6efc..bcb73b74 100644
 --- a/compiler/GHC/Llvm/Ppr.hs
 +++ b/compiler/GHC/Llvm/Ppr.hs
-@@ -256,6 +256,7 @@ ppMetaExpr :: LlvmCgConfig -> MetaExpr -> SDoc
+@@ -297,6 +297,7 @@ ppMetaExpr :: IsLine doc => LlvmCgConfig
  ppMetaExpr opts = \case
    MetaVar (LMLitVar (LMNullLit _)) -> text "null"
    MetaStr    s                     -> char '!' <> doubleQuotes (ftext s)
 +  MetaLit    l                     -> ppTypeLit opts l
-   MetaNode   n                     -> ppr n
+   MetaNode   n                     -> ppMetaId n
    MetaVar    v                     -> ppVar opts v
-   MetaStruct es                    -> char '!' <> braces (ppCommaJoin (map (ppMetaExpr opts) es))
--- 
-2.45.2
-
+   MetaStruct es                    -> char '!' <> braces (ppCommaJoin (ppMetaExpr opts) es)


=====================================
p/ghc/debian/patches/series
=====================================
@@ -1,6 +1,6 @@
 ARM-VFPv3D16
 no-missing-haddock-file-warning
-buildpath-abi-stability.patch
+#buildpath-abi-stability.patch
 x32-use-native-x86_64-insn.patch
 kfreebsd-aclocal.m4
 local-mathjax
@@ -26,5 +26,6 @@ alpha-fix-ieee_set_fp_control-invocation.patch
 0001-llvmGen-Add-export-list-to-GHC.Llvm.MetaData.patch
 0002-llvmGen-Allow-LlvmLits-in-MetaExprs.patch
 0003-llvmGen-Introduce-infrastructure-for-module-flag-metadata.patch
-0004-llvmGen-Pass-mcmodel-medium-option-to-LLVM-backend-on-LoongArch.patch
+#0004-llvmGen-Pass-mcmodel-medium-option-to-LLVM-backend-on-LoongArch.patch
 0005-Pass-the-mcmodel-medium-parameter-to-CC-via-GHC.patch
+hp2ps-gcc15.patch



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/a77bf04d2456541aab4db039df9c1c471ce533d7
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/20250914/c01724b7/attachment-0001.htm>