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

Ilias Tsitsimpis (@iliastsi) gitlab at salsa.debian.org
Mon Dec 18 15:23:51 GMT 2023



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


Commits:
b47af25a by Ilias Tsitsimpis at 2023-12-18T17:19:35+02:00
hadrian: Upgrade to 9.6.3

- - - - -


7 changed files:

- p/haskell-hadrian/debian/changelog
- p/haskell-hadrian/debian/patches/enable-interpreter
- + p/haskell-hadrian/debian/patches/fix-dnosmp
- p/haskell-hadrian/debian/patches/hadrian-haddock-opts
- p/haskell-hadrian/debian/patches/hadrian-iserv
- p/haskell-hadrian/debian/patches/hurd-hadrian-supportpaths
- p/haskell-hadrian/debian/patches/series


Changes:

=====================================
p/haskell-hadrian/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-hadrian (9.6.3-1~exp1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 18 Dec 2023 17:16:29 +0200
+
 haskell-hadrian (9.4.8-1~exp1) experimental; urgency=medium
 
   * New upstream release


=====================================
p/haskell-hadrian/debian/patches/enable-interpreter
=====================================
@@ -6,7 +6,7 @@ Index: b/src/Oracles/Setting.hs
 ===================================================================
 --- a/src/Oracles/Setting.hs
 +++ b/src/Oracles/Setting.hs
-@@ -287,13 +287,8 @@ hostSupportsRPaths = anyHostOs ["linux",
+@@ -292,13 +292,8 @@ hostSupportsRPaths = anyHostOs ["linux",
  -- | Check whether the target supports GHCi.
  ghcWithInterpreter :: Action Bool
  ghcWithInterpreter = do


=====================================
p/haskell-hadrian/debian/patches/fix-dnosmp
=====================================
@@ -0,0 +1,62 @@
+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/hadrian-haddock-opts
=====================================
@@ -8,7 +8,7 @@ Index: b/src/Settings/Builders/Haddock.hs
 ===================================================================
 --- a/src/Settings/Builders/Haddock.hs
 +++ b/src/Settings/Builders/Haddock.hs
-@@ -32,6 +32,7 @@ haddockBuilderArgs = mconcat
+@@ -30,6 +30,7 @@ haddockBuilderArgs = mconcat
              , arg "-o", arg $ takeDirectory output
              , arg "-t", arg "Haskell Hierarchical Libraries"
              , arg "-p", arg "libraries/prologue.txt"
@@ -16,7 +16,7 @@ Index: b/src/Settings/Builders/Haddock.hs
              , pure [ "--read-interface="
                       ++ (takeFileName . takeDirectory) haddock
                       ++ "," ++ haddock | haddock <- inputs ] ]
-@@ -60,6 +61,7 @@ haddockBuilderArgs = mconcat
+@@ -58,6 +59,7 @@ haddockBuilderArgs = mconcat
              , arg "--hyperlinked-source"
              , arg "--hoogle"
              , arg "--quickjump"


=====================================
p/haskell-hadrian/debian/patches/hadrian-iserv
=====================================
@@ -7,7 +7,7 @@ Index: b/src/Packages.hs
 ===================================================================
 --- a/src/Packages.hs
 +++ b/src/Packages.hs
-@@ -192,7 +192,7 @@ programPath context at Context {..} = do
+@@ -197,7 +197,7 @@ programPath context at Context {..} = do
      -- See: https://github.com/snowleopard/hadrian/issues/570
      -- Likewise for @iserv@ and @unlit at .
      name <- programName context


=====================================
p/haskell-hadrian/debian/patches/hurd-hadrian-supportpaths
=====================================
@@ -6,7 +6,7 @@ Index: b/src/Oracles/Setting.hs
 ===================================================================
 --- a/src/Oracles/Setting.hs
 +++ b/src/Oracles/Setting.hs
-@@ -273,7 +273,7 @@ anyHostOs = matchSetting HostOs
+@@ -278,7 +278,7 @@ anyHostOs = matchSetting HostOs
  isElfTarget :: Action Bool
  isElfTarget = anyTargetOs
      [ "linux", "freebsd", "dragonfly", "openbsd", "netbsd", "solaris2", "kfreebsdgnu"
@@ -15,7 +15,7 @@ Index: b/src/Oracles/Setting.hs
      ]
  
  -- | Check whether the host OS supports the @-rpath@ linker option when
-@@ -282,7 +282,7 @@ isElfTarget = anyTargetOs
+@@ -287,7 +287,7 @@ isElfTarget = anyTargetOs
  -- TODO: Windows supports lazy binding (but GHC doesn't currently support
  --       dynamic way on Windows anyways).
  hostSupportsRPaths :: Action Bool


=====================================
p/haskell-hadrian/debian/patches/series
=====================================
@@ -1,5 +1,6 @@
 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/b47af25aef8f5faac713458da85a62c0f13a71d1

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


More information about the Pkg-haskell-commits mailing list