[Git][haskell-team/DHG_packages][experimental] hadrian: Upgrade to 9.6.4

[Ilias Tsitsimpis (@iliastsi)]

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


Commits:
eb96826d by Ilias Tsitsimpis at 2024-01-13T16:18:15+02:00
hadrian: Upgrade to 9.6.4

- - - - -


3 changed files:

- p/haskell-hadrian/debian/changelog
- − p/haskell-hadrian/debian/patches/fix-dnosmp
- p/haskell-hadrian/debian/patches/series


Changes:

=====================================
p/haskell-hadrian/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-hadrian (9.6.4-1~exp1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sat, 13 Jan 2024 16:15:06 +0200
+
 haskell-hadrian (9.6.3-1~exp1) experimental; urgency=medium
 
   * New upstream release


=====================================
p/haskell-hadrian/debian/patches/fix-dnosmp deleted
=====================================
@@ -1,62 +0,0 @@
-commit bea762f2c9d3ff1f67e3fdb22a8ac288b32225b0
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-Date:   Thu Oct 12 12:44:02 2023 +0300
-
-    hadrian: Pass -DNOSMP to C compiler when needed
-    
-    Hadrian passes the -DNOSMP flag to GHC when the target doesn't support
-    SMP, but doesn't pass it to CC as well, leading to the following
-    compilation error on mips64el:
-    
-    | Run Cc (FindCDependencies CDep) Stage1: rts/sm/NonMovingScav.c => _build/stage1/rts/build/c/sm/NonMovingScav.o.d
-    Command line: /usr/bin/mips64el-linux-gnuabi64-gcc -E -MM -MG -MF _build/stage1/rts/build/c/hooks/FlagDefaults.thr_debug_p_o.d -MT _build/stage1/rts/build/c/hooks/FlagDefaults.o -Irts/include -I_build/stage1/rts/build -I_build/stage1/rts/build/include -Irts/include -x c rts/hooks/FlagDefaults.c -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Winline -Wpointer-arith -Wmissing-noreturn -Wnested-externs -Wredundant-decls -Wundef -fno-strict-aliasing -DTHREADED_RTS -DDEBUG -fomit-frame-pointer -O2 -g -Irts -I_build/stage1/rts/build -DDEBUG -fno-omit-frame-pointer -g3 -O0
-    ===> Command failed with error code: 1
-    In file included from rts/include/Stg.h:348,
-                     from rts/include/Rts.h:38,
-                     from rts/hooks/FlagDefaults.c:8:
-    rts/include/stg/SMP.h:416:2: error: #error memory barriers unimplemented on this architecture
-      416 | #error memory barriers unimplemented on this architecture
-          |  ^~~~~
-    rts/include/stg/SMP.h:440:2: error: #error memory barriers unimplemented on this architecture
-      440 | #error memory barriers unimplemented on this architecture
-          |  ^~~~~
-    rts/include/stg/SMP.h:464:2: error: #error memory barriers unimplemented on this architecture
-      464 | #error memory barriers unimplemented on this architecture
-          |  ^~~~~
-    
-    The old make system correctly passed this flag to both GHC and CC [1].
-    
-    Fix this error by passing -DNOSMP to CC as well.
-    
-    [1] https://gitlab.haskell.org/ghc/ghc/-/blob/00920f176b0235d5bb52a8e054d89a664f8938fe/rts/ghc.mk#L407
-    
-    Closes #24082
-
-Index: b/src/Settings/Packages.hs
-===================================================================
---- a/src/Settings/Packages.hs
-+++ b/src/Settings/Packages.hs
-@@ -296,13 +296,11 @@ rtsPackageArgs = package rts ? do
-           -- Set the namespace for the rts fs functions
-           , arg $ "-DFS_NAMESPACE=rts"
-           , arg $ "-DCOMPILING_RTS"
--          , notM targetSupportsSMP           ? arg "-DNOSMP"
-           , way `elem` [debug, debugDynamic] ? pure [ "-DTICKY_TICKY"
-                                                     , "-optc-DTICKY_TICKY"]
-           , Profiling `wayUnit` way          ? arg "-DPROFILING"
-           , Threaded  `wayUnit` way          ? arg "-DTHREADED_RTS"
--          , notM targetSupportsSMP           ? pure [ "-DNOSMP"
--                                                    , "-optc-DNOSMP" ]
-+          , notM targetSupportsSMP           ? arg "-optc-DNOSMP"
-           ]
- 
-     let cArgs = mconcat
-@@ -320,6 +318,8 @@ rtsPackageArgs = package rts ? do
-           , arg "-Irts"
-           , arg $ "-I" ++ path
- 
-+          , notM targetSupportsSMP           ? arg "-DNOSMP"
-+
-           , Debug     `wayUnit` way          ? pure [ "-DDEBUG"
-                                                     , "-fno-omit-frame-pointer"
-                                                     , "-g3"


=====================================
p/haskell-hadrian/debian/patches/series
=====================================
@@ -1,6 +1,5 @@
 hadrian-haddock-opts
 hadrian-iserv
-fix-dnosmp
 enable-interpreter
 hurd-hadrian-osstring
 hurd-hadrian-supportpaths



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

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