Accepting request 1218536 from devel:languages:haskell

version update

OBS-URL: https://build.opensuse.org/request/show/1218536
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc?expand=0&rev=109

9_4_4-bootstrap-sources.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3de754bb3e45d4b3980ed238781cfd808f4e7c84ceae73213662f1bf5ea2d8fa
+size 1526663

9_8_2-bootstrap-sources.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46da56e985357bfa1f39f22b9073f9ad8687eecccbc232c46fb027f5782ebe95
-size 2854875

Cabal-absolute-datadir.patch

@@ -1,277 +0,0 @@
-From 1f8f9fd08fb90bd94668ac8a81c94e179fc8ab86 Mon Sep 17 00:00:00 2001
-From: Matthew Pickering <matthewtpickering@gmail.com>
-Date: Fri, 14 Mar 2025 12:55:51 +0000
-Subject: [PATCH] Set <pkgname_datadir> to an absolute path
-
-Ticket #10717 points out that the <pkgname>_datadir environment variable
-should be set to an absolute path since the test executables may
-change directory during their invocation.
-
-This is easily fixed by using the absoluteWorkingDirLBI
-function, which was introduced in 027bddfcdf3ba298376c60be1ccf664ebc394cec,
-
-Fixes #10717
----
- Cabal/src/Distribution/Simple/Bench.hs        |  2 +
- Cabal/src/Distribution/Simple/Build.hs        | 50 ++++++++++---------
- Cabal/src/Distribution/Simple/Haddock.hs      |  3 +-
- Cabal/src/Distribution/Simple/Test.hs         |  2 +
- cabal-install/src/Distribution/Client/Run.hs  |  3 ++
- .../DataDirSetupTest/cabal.cabal.out          | 13 +++++
- .../PackageTests/DataDirSetupTest/cabal.out   | 13 +++++
- changelog.d/pr-10830.md                       | 10 ++++
- 8 files changed, 72 insertions(+), 24 deletions(-)
- create mode 100644 cabal-testsuite/PackageTests/DataDirSetupTest/cabal.cabal.out
- create mode 100644 cabal-testsuite/PackageTests/DataDirSetupTest/cabal.out
- create mode 100644 changelog.d/pr-10830.md
-
-diff --git a/Cabal/src/Distribution/Simple/Bench.hs b/Cabal/src/Distribution/Simple/Bench.hs
-index 78f169f25..c4b4dbd2f 100644
---- a/Cabal/src/Distribution/Simple/Bench.hs
-+++ b/Cabal/src/Distribution/Simple/Bench.hs
-@@ -56,6 +56,7 @@ bench
-   -- ^ flags sent to benchmark
-   -> IO ()
- bench args pkg_descr lbi flags = do
-+  curDir <- LBI.absoluteWorkingDirLBI lbi
-   let verbosity = fromFlag $ benchmarkVerbosity flags
-       benchmarkNames = args
-       pkgBenchmarks = PD.benchmarks pkg_descr
-@@ -71,6 +72,7 @@ bench args pkg_descr lbi flags = do
-                 { -- Include any build-tool-depends on build tools internal to the current package.
-                   LBI.withPrograms =
-                     addInternalBuildTools
-+                      curDir
-                       pkg_descr
-                       lbi
-                       (benchmarkBuildInfo bm)
-diff --git a/Cabal/src/Distribution/Simple/Build.hs b/Cabal/src/Distribution/Simple/Build.hs
-index 0ebd51e48..647480d35 100644
---- a/Cabal/src/Distribution/Simple/Build.hs
-+++ b/Cabal/src/Distribution/Simple/Build.hs
-@@ -187,13 +187,15 @@ build_setupHooks
-     -- dumped.
-     dumpBuildInfo verbosity distPref (configDumpBuildInfo (configFlags lbi)) pkg_descr lbi flags
- 
-+    curDir <- absoluteWorkingDirLBI lbi
-+
-     -- Now do the actual building
-     (\f -> foldM_ f (installedPkgs lbi) componentsToBuild) $ \index target -> do
-       let comp = targetComponent target
-           clbi = targetCLBI target
-           bi = componentBuildInfo comp
-           -- Include any build-tool-depends on build tools internal to the current package.
--          progs' = addInternalBuildTools pkg_descr lbi bi (withPrograms lbi)
-+          progs' = addInternalBuildTools curDir pkg_descr lbi bi (withPrograms lbi)
-           lbi' =
-             lbi
-               { withPrograms = progs'
-@@ -375,17 +377,20 @@ repl_setupHooks
- 
-     internalPackageDB <- createInternalPackageDB verbosity lbi distPref
- 
--    let lbiForComponent comp lbi' =
--          lbi'
--            { withPackageDB = withPackageDB lbi ++ [internalPackageDB]
--            , withPrograms =
--                -- Include any build-tool-depends on build tools internal to the current package.
--                addInternalBuildTools
--                  pkg_descr
--                  lbi'
--                  (componentBuildInfo comp)
--                  (withPrograms lbi')
--            }
-+    let lbiForComponent comp lbi' = do
-+          curDir <- absoluteWorkingDirLBI lbi'
-+          return $
-+            lbi'
-+              { withPackageDB = withPackageDB lbi' ++ [internalPackageDB]
-+              , withPrograms =
-+                  -- Include any build-tool-depends on build tools internal to the current package.
-+                  addInternalBuildTools
-+                    curDir
-+                    pkg_descr
-+                    lbi'
-+                    (componentBuildInfo comp)
-+                    (withPrograms lbi')
-+              }
-         runPreBuildHooks :: LocalBuildInfo -> TargetInfo -> IO ()
-         runPreBuildHooks lbi2 tgt =
-           let inputs =
-@@ -403,7 +408,7 @@ repl_setupHooks
-       [ do
-         let clbi = targetCLBI subtarget
-             comp = targetComponent subtarget
--            lbi' = lbiForComponent comp lbi
-+        lbi' <- lbiForComponent comp lbi
-         preBuildComponent runPreBuildHooks verbosity lbi' subtarget
-         buildComponent
-           (mempty{buildCommonFlags = mempty{setupVerbosity = toFlag verbosity}})
-@@ -420,7 +425,7 @@ repl_setupHooks
-     -- REPL for target components
-     let clbi = targetCLBI target
-         comp = targetComponent target
--        lbi' = lbiForComponent comp lbi
-+    lbi' <- lbiForComponent comp lbi
-     preBuildComponent runPreBuildHooks verbosity lbi' target
-     replComponent flags verbosity pkg_descr lbi' suffixHandlers comp clbi distPref
- 
-@@ -925,12 +930,13 @@ createInternalPackageDB verbosity lbi distPref = do
- --    'progOverrideEnv', so that any programs configured from now on will be
- --    able to invoke these build tools.
- addInternalBuildTools
--  :: PackageDescription
-+  :: AbsolutePath (Dir Pkg)
-+  -> PackageDescription
-   -> LocalBuildInfo
-   -> BuildInfo
-   -> ProgramDb
-   -> ProgramDb
--addInternalBuildTools pkg lbi bi progs =
-+addInternalBuildTools pwd pkg lbi bi progs =
-   prependProgramSearchPathNoLogging
-     internalToolPaths
-     [pkgDataDirVar]
-@@ -949,13 +955,11 @@ addInternalBuildTools pkg lbi bi progs =
-                 buildDir lbi
-                   </> makeRelativePathEx (toolName' </> toolName' <.> exeExtension (hostPlatform lbi))
-       ]
--    mbWorkDir = mbWorkDirLBI lbi
--    rawDataDir = dataDir pkg
--    dataDirPath
--      | null $ getSymbolicPath rawDataDir =
--          interpretSymbolicPath mbWorkDir sameDirectory
--      | otherwise =
--          interpretSymbolicPath mbWorkDir rawDataDir
-+
-+    -- This is an absolute path, so if a process changes directory, it can still
-+    -- find the datadir (#10717)
-+    dataDirPath :: FilePath
-+    dataDirPath = interpretSymbolicPathAbsolute pwd (dataDir pkg)
- 
- -- TODO: build separate libs in separate dirs so that we can build
- -- multiple libs, e.g. for 'LibTest' library-style test suites
-diff --git a/Cabal/src/Distribution/Simple/Haddock.hs b/Cabal/src/Distribution/Simple/Haddock.hs
-index ee2b88e76..5c534c01d 100644
---- a/Cabal/src/Distribution/Simple/Haddock.hs
-+++ b/Cabal/src/Distribution/Simple/Haddock.hs
-@@ -331,12 +331,13 @@ haddock_setupHooks
-       createInternalPackageDB verbosity lbi (flag $ setupDistPref . haddockCommonFlags)
- 
-     (\f -> foldM_ f (installedPkgs lbi) targets') $ \index target -> do
-+      curDir <- absoluteWorkingDirLBI lbi
-       let
-         component = targetComponent target
-         clbi = targetCLBI target
-         bi = componentBuildInfo component
-         -- Include any build-tool-depends on build tools internal to the current package.
--        progs' = addInternalBuildTools pkg_descr lbi bi (withPrograms lbi)
-+        progs' = addInternalBuildTools curDir pkg_descr lbi bi (withPrograms lbi)
-         lbi' =
-           lbi
-             { withPrograms = progs'
-diff --git a/Cabal/src/Distribution/Simple/Test.hs b/Cabal/src/Distribution/Simple/Test.hs
-index 5b7a6daa7..57107eef6 100644
---- a/Cabal/src/Distribution/Simple/Test.hs
-+++ b/Cabal/src/Distribution/Simple/Test.hs
-@@ -70,6 +70,7 @@ test
-   -- ^ flags sent to test
-   -> IO ()
- test args pkg_descr lbi0 flags = do
-+  curDir <- LBI.absoluteWorkingDirLBI lbi0
-   let common = testCommonFlags flags
-       verbosity = fromFlag $ setupVerbosity common
-       distPref = fromFlag $ setupDistPref common
-@@ -96,6 +97,7 @@ test args pkg_descr lbi0 flags = do
-                 { withPrograms =
-                     -- Include any build-tool-depends on build tools internal to the current package.
-                     addInternalBuildTools
-+                      curDir
-                       pkg_descr
-                       lbi
-                       (PD.testBuildInfo suite)
-diff --git a/cabal-install/src/Distribution/Client/Run.hs b/cabal-install/src/Distribution/Client/Run.hs
-index 88671a9f5..1dd9db32c 100644
---- a/cabal-install/src/Distribution/Client/Run.hs
-+++ b/cabal-install/src/Distribution/Client/Run.hs
-@@ -35,6 +35,7 @@ import Distribution.Simple.Flag (fromFlag)
- import Distribution.Simple.LocalBuildInfo
-   ( ComponentName (..)
-   , LocalBuildInfo (..)
-+  , absoluteWorkingDirLBI
-   , buildDir
-   , depLibraryPaths
-   , interpretSymbolicPathLBI
-@@ -142,6 +143,7 @@ splitRunArgs verbosity lbi args =
- -- | Run a given executable.
- run :: Verbosity -> LocalBuildInfo -> Executable -> [String] -> IO ()
- run verbosity lbi exe exeArgs = do
-+  curDir <- absoluteWorkingDirLBI lbi
-   let distPref = fromFlag $ configDistPref $ configFlags lbi
-       buildPref = buildDir lbi
-       pkg_descr = localPkgDescr lbi
-@@ -154,6 +156,7 @@ run verbosity lbi exe exeArgs = do
-           , -- Include any build-tool-depends on build tools internal to the current package.
-             withPrograms =
-               addInternalBuildTools
-+                curDir
-                 pkg_descr
-                 lbi
-                 (buildInfo exe)
-diff --git a/cabal-testsuite/PackageTests/DataDirSetupTest/cabal.cabal.out b/cabal-testsuite/PackageTests/DataDirSetupTest/cabal.cabal.out
-new file mode 100644
-index 000000000..f1e923b5c
---- /dev/null
-+++ b/cabal-testsuite/PackageTests/DataDirSetupTest/cabal.cabal.out
-@@ -0,0 +1,13 @@
-+# Setup configure
-+Configuring datadir-test-0.1.0.0...
-+# Setup build
-+Preprocessing library for datadir-test-0.1.0.0...
-+Building library for datadir-test-0.1.0.0...
-+Preprocessing test suite 'datadir-test' for datadir-test-0.1.0.0...
-+Building test suite 'datadir-test' for datadir-test-0.1.0.0...
-+# Setup test
-+Running 1 test suites...
-+Test suite datadir-test: RUNNING...
-+Test suite datadir-test: PASS
-+Test suite logged to: cabal.cabal.dist/work/dist/test/datadir-test-0.1.0.0-datadir-test.log
-+1 of 1 test suites (1 of 1 test cases) passed.
-diff --git a/cabal-testsuite/PackageTests/DataDirSetupTest/cabal.out b/cabal-testsuite/PackageTests/DataDirSetupTest/cabal.out
-new file mode 100644
-index 000000000..eadbc3aea
---- /dev/null
-+++ b/cabal-testsuite/PackageTests/DataDirSetupTest/cabal.out
-@@ -0,0 +1,13 @@
-+# Setup configure
-+Configuring datadir-test-0.1.0.0...
-+# Setup build
-+Preprocessing library for datadir-test-0.1.0.0...
-+Building library for datadir-test-0.1.0.0...
-+Preprocessing test suite 'datadir-test' for datadir-test-0.1.0.0...
-+Building test suite 'datadir-test' for datadir-test-0.1.0.0...
-+# Setup test
-+Running 1 test suites...
-+Test suite datadir-test: RUNNING...
-+Test suite datadir-test: PASS
-+Test suite logged to: cabal.dist/work/dist/test/datadir-test-0.1.0.0-datadir-test.log
-+1 of 1 test suites (1 of 1 test cases) passed.
-diff --git a/changelog.d/pr-10830.md b/changelog.d/pr-10830.md
-new file mode 100644
-index 000000000..9e7876144
---- /dev/null
-+++ b/changelog.d/pr-10830.md
-@@ -0,0 +1,10 @@
-+---
-+synopsis: Set <pkgname>_datadir to an absolute path when running tests
-+packages: [Cabal]
-+prs: 10828
-+issues: [10717]
-+---
-+
-+Fix a regression where `<pkgname>_datadir` was set to a relative path. This
-+caused issues when running testsuites which changed the working directory and
-+accessed datafiles.
--- 
-2.50.1
-

Disable-unboxed-arrays.patch

@@ -0,0 +1,12 @@
+Index: ghc-9.4.4/libraries/containers/containers/include/containers.h
+===================================================================
+--- ghc-9.4.4.orig/libraries/containers/containers/include/containers.h
++++ ghc-9.4.4/libraries/containers/containers/include/containers.h
+@@ -23,7 +23,6 @@
+  * Unboxed arrays are broken on big-endian architectures.
+  * See https://gitlab.haskell.org/ghc/ghc/-/issues/16998
+  */
+-# define USE_UNBOXED_ARRAYS 1
+ #endif
+ #endif
+ 

_constraints

@@ -28,14 +28,4 @@
       </disk> 
     </hardware>
   </overwrite>
- <overwrite>
-    <conditions>
-      <arch>loongarch64</arch>
-    </conditions>
-    <hardware>
-      <physicalmemory>
-        <size unit="G">16</size>
-      </physicalmemory>
-    </hardware>
-  </overwrite>
 </constraints>

cabal-riscv64.patch

@@ -0,0 +1,41 @@
+Index: ghc-9.4.5/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs
+===================================================================
+--- ghc-9.4.5.orig/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs
++++ ghc-9.4.5/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs
+@@ -159,7 +159,7 @@ buildOS = classifyOS Permissive System.I
+ 
+ -- | These are the known Arches: I386, X86_64, PPC, PPC64, Sparc,
+ -- Arm, AArch64, Mips, SH, IA64, S390, S390X, Alpha, Hppa, Rs6000,
+--- M68k, Vax, JavaScript and Wasm32.
++-- M68k, Vax, RISCV64, JavaScript and Wasm32.
+ --
+ -- The following aliases can also be used:
+ --    * PPC alias: powerpc
+@@ -174,6 +174,7 @@ data Arch = I386  | X86_64  | PPC  | PPC
+           | IA64  | S390    | S390X
+           | Alpha | Hppa    | Rs6000
+           | M68k  | Vax
++          | RISCV64
+           | JavaScript
+           | Wasm32
+           | OtherArch String
+@@ -189,6 +190,7 @@ knownArches = [I386, X86_64, PPC, PPC64,
+               ,IA64, S390, S390X
+               ,Alpha, Hppa, Rs6000
+               ,M68k, Vax
++              ,RISCV64
+               ,JavaScript
+               ,Wasm32]
+ 
+Index: ghc-9.4.5/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs
+===================================================================
+--- ghc-9.4.5.orig/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs
++++ ghc-9.4.5/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs
+@@ -729,6 +729,7 @@ platformDefines lbi =
+       Rs6000      -> ["rs6000"]
+       M68k        -> ["m68k"]
+       Vax         -> ["vax"]
++      RISCV64     -> ["riscv64"]
+       JavaScript  -> ["javascript"]
+       Wasm32      -> ["wasm32"]
+       OtherArch _ -> []

ghc-9.12.2-src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e49cd5dde43f348c5716e5de9a5d7a0f8d68d945dc41cf75dfdefe65084f933
-size 33394536

ghc-9.8.3-src.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70
+size 32565948

ghc-Cabal-install-PATH-warning.patch

@@ -1,18 +1,14 @@
-Index: ghc-9.12.2/libraries/Cabal/Cabal/src/Distribution/Simple/Install.hs
+Index: ghc-9.2.0.20210331/libraries/Cabal/Cabal/src/Distribution/Simple/Install.hs
 ===================================================================
---- ghc-9.12.2.orig/libraries/Cabal/Cabal/src/Distribution/Simple/Install.hs
-+++ ghc-9.12.2/libraries/Cabal/Cabal/src/Distribution/Simple/Install.hs
-@@ -297,12 +297,7 @@ copyComponent verbosity pkg_descr lbi (C
-     )
-   inPath <- isInSearchPath binPref
-   when (not inPath) $
--    warn
--      verbosity
--      ( "The directory "
--          ++ binPref
--          ++ " is not in the system search path."
--      )
-+    warn verbosity ("Executable installed in " ++ binPref)
-   case compilerFlavor (compiler lbi) of
-     GHC -> GHC.installExe verbosity lbi binPref buildPref progFix pkg_descr exe
-     GHCJS -> GHCJS.installExe verbosity lbi binPref buildPref progFix pkg_descr exe
+--- ghc-9.2.0.20210331.orig/libraries/Cabal/Cabal/src/Distribution/Simple/Install.hs
++++ ghc-9.2.0.20210331/libraries/Cabal/Cabal/src/Distribution/Simple/Install.hs
+@@ -206,8 +206,7 @@ copyComponent verbosity pkg_descr lbi (C
+                       ++ " in " ++ binPref)
+     inPath <- isInSearchPath binPref
+     when (not inPath) $
+-      warn verbosity ("The directory " ++ binPref
+-                      ++ " is not in the system search path.")
++      warn verbosity ("Executable installed in " ++ binPref)
+     case compilerFlavor (compiler lbi) of
+       GHC   -> GHC.installExe   verbosity lbi binPref buildPref progFix pkg_descr exe
+       GHCJS -> GHCJS.installExe verbosity lbi binPref buildPref progFix pkg_descr exe

ghc-with-interpreter.patch

@@ -0,0 +1,14 @@
+Index: ghc-9.4.5/hadrian/src/Oracles/Setting.hs
+===================================================================
+--- ghc-9.4.5.orig/hadrian/src/Oracles/Setting.hs
++++ ghc-9.4.5/hadrian/src/Oracles/Setting.hs
+@@ -292,7 +292,8 @@ ghcWithInterpreter = do
+                           , "darwin", "kfreebsdgnu" ]
+     goodArch <- anyTargetArch [ "i386", "x86_64", "powerpc"
+                               , "arm", "aarch64", "s390x"
+-                              , "powerpc64", "powerpc64le" ]
++                              , "powerpc64", "powerpc64le"
++                              , "riscv64" ]
+     return $ goodOs && goodArch
+ 
+ -- | Variants of the ARM architecture.

ghc.changes

@@ -1,80 +1,3 @@
--------------------------------------------------------------------
-Mon Aug  4 20:57:07 UTC 2025 - Andreas Schwab <schwab@suse.de>
-
-- Cabal-absolute-datadir.patch: Set <pkgname_datadir> to an absolute path
-
--------------------------------------------------------------------
-Wed Jul 30 07:38:27 UTC 2025 - Andreas Schwab <schwab@suse.de>
-
-- Require llvm only on ghc_llvm_archs
-- Adjust memory limits, removing special case for qemu emulation
-- Don't apply ghc-hadrian-s390x-rts--qg.patch on riscv64
-
--------------------------------------------------------------------
-Mon Jul 28 16:04:53 UTC 2025 - Ondřej Súkup <mimi.vx@gmail.com>
-
-- update to 9.12.2
-- dropped patches:
- + Disable-unboxed-arrays.patch
- + hadrian-9.10-deps.patch
- + riscv64-ncg.patch
-- refreshed patches
- + ghc-gen_contents_index-haddock-path.patch
- + gnu23-hp2ps.patch
- + ghc-Cabal-install-PATH-warning.patch
-- full changelog at:
- + https://downloads.haskell.org/~ghc/9.12.2/docs/users_guide/9.12.2-notes.html
-
--------------------------------------------------------------------
-Thu Jul 24 14:50:47 UTC 2025 - Ondřej Súkup <mimi.vx@gmail.com>
-
-- add gnu23-hp2ps.patch for build hp2ps with gcc15+ 
-
--------------------------------------------------------------------
-Thu Jul  3 18:49:03 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
-
-- Apply ghc-hadrian-s390x-rts--qg.patch on loongarch64 as well
-- Set physicalmemory for loongarch64 in _constraints to 16 GB
-
--------------------------------------------------------------------
-Thu May 15 21:10:31 UTC 2025 - Ondřej Súkup <mimi.vx@gmail.com>
-
-- more work on riscv64-ncg.patch 
-
--------------------------------------------------------------------
-Fri May  9 09:23:53 UTC 2025 - Ondřej Súkup <mimi.vx@gmail.com>
-
-- update to version 9.10.2:
-- refreshed patches: hadrian-9.10-deps.patch
-                     riscv64-ncg.patch
-- dropped patches:   os-string-be.patch
-                     ppc64le-miscompilation.patch
-- full chagelog: 
-  https://downloads.haskell.org/~ghc/9.10.2/docs/users_guide/9.10.2-notes.html
-
--------------------------------------------------------------------
-Mon Nov 25 14:46:09 UTC 2024 - Andreas Schwab <schwab@suse.de>
-
-- riscv64-ncg.patch: Backport of MR 13105, NCG for RISCV64
-- Don't require on llvm on riscv64
-
--------------------------------------------------------------------
-Fri Nov 22 14:54:22 UTC 2024 - Ondřej Súkup <mimi.vx@gmail.com>
-
-- Update to version 9.10.1. The change log for this release is at:
-  https://downloads.haskell.org/~ghc/9.10.1/docs/users_guide/9.10.1-notes.html
-- use ghc-bootstrap 9.8.2
-- enable numa on all architectures
-- cleanup dead parts of specfile
-- patch changes:
- * added:
-  - hadrian-9.10-deps.patch
-  - os-string-be.patch
-  - ppc64le-miscompilation.patch
- * dropped:
-  - cabal-riscv64.patch
-  - ghc-with-interpreter.patch
-
 -------------------------------------------------------------------
 Mon Oct 21 10:36:19 UTC 2024 - Ondřej Súkup <mimi.vx@gmail.com>
 

ghc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ghc
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -11,19 +11,31 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%define full_version 9.12.2
-%define short_version 9.12.2
 
-%global llvm_major 18
+%define full_version 9.8.3
+%define short_version 9.8.3
+
+%ifnarch s390x
+%define with_libnuma 1
+%else
+%define with_libnuma 0
+%endif
+
+%global llvm_major 14
 
 # conditionals
+
 # disable prof, docs, perf build
 # bcond_with for production builds: disable quick build
 %bcond_with quickbuild
 
+# make sure ghc libraries' ABI hashes unchanged (ghcX.Y not supported yet)
+%bcond_with abicheck
+
 # bcond_without for production builds: use Hadrian buildsystem
 %bcond_without hadrian
 
@@ -58,18 +70,14 @@
 %{?with_haddock:%bcond_without manual}
 %endif
 
-%global ghc_llvm_archs s390x
+%global ghc_llvm_archs s390x riscv64
 %global ghc_unregisterized_arches noarch
 
-%global base_ver 4.21.0.0
-%global cabal_ver 3.14.1.0
+%global base_ver 4.19.2.0
 %global ghc_compact_ver 0.1.0.0
-%global hpc_ver 0.7.0.2
-%global hsc2hs_ver 0.68.10
+%global hpc_ver 0.7.0.0
+%global hsc2hs_ver 0.68.8
 %global ghc_bignum_ver 1.3
-%global xhtml_ver 3000.2.2.1
-%global ghc_ver_for_lib 9.1202.0
-%global haddock_api_ver 2.30.0
 
 Name:           ghc
 Version:        %{short_version}
@@ -79,30 +87,31 @@ License:        BSD-3-Clause
 URL:            https://www.haskell.org/ghc/
 Source:         https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz
 Source2:        ghc-rpmlintrc
-Source4:        9_8_2-bootstrap-sources.tar.gz
+Source4:        9_4_4-bootstrap-sources.tar.gz
 Source5:        ghc-pkg.man
 Source6:        haddock.man
 Source7:        runghc.man
-
 Patch1:         ghc-gen_contents_index-haddock-path.patch
 # https://ghc.haskell.org/trac/ghc/ticket/15689
 Patch2:         ghc-Cabal-install-PATH-warning.patch
-Patch3:         Cabal-absolute-datadir.patch
+# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptrommler@icloud.com -- Do not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
+Patch3:         Disable-unboxed-arrays.patch
+# PATCH-FIX-UPSTREAM Hadrian: enable GHCi support on riscv64 (dd38aca95a)
+Patch100:       ghc-with-interpreter.patch
+# PATCH-FIX-UPSTREAM libraries/Cabal: Add support for the 64-bit RISC-V architecture (d89526f98)
+Patch101:       cabal-riscv64.patch
 Patch200:       ghc-hadrian-s390x-rts--qg.patch
-Patch400:       gnu23-hp2ps.patch
-
 BuildRequires:  binutils-devel
 BuildRequires:  gcc-PIE
 BuildRequires:  gcc-c++
-BuildRequires:  ghc-bootstrap >= 9.8
+BuildRequires:  ghc-bootstrap >= 9.4
 BuildRequires:  ghc-bootstrap-helpers >= 1.3
-BuildRequires:  ghc-rpm-macros-extra => 2.9.1
+BuildRequires:  ghc-rpm-macros-extra => 2.6.1
 BuildRequires:  glibc-devel
 BuildRequires:  gmp-devel
 BuildRequires:  libdw-devel
 BuildRequires:  libelf-devel
 BuildRequires:  libffi-devel
-BuildRequires:  libdwarf-devel
 BuildRequires:  libtool
 %ifarch %{ghc_llvm_archs}
 BuildRequires:  clang%{llvm_major}
@@ -122,13 +131,16 @@ Requires:       %{name}-ghc-devel = %{version}-%{release}
 Requires:       %{name}-ghc-heap-devel = %{version}-%{release}
 Requires:       %{name}-ghci-devel = %{version}-%{release}
 Requires:       %{name}-hpc-devel = %{hpc_ver}-%{release}
+Recommends:     %{name}-compiler-default = %{version}-%{release}
 %if %{without ghc_debuginfo}
 %undefine _enable_debug_packages
 %endif
 %if %{with manual}
 BuildRequires:  python3-Sphinx
 %endif
+%if %{with_libnuma}
 BuildRequires:  libnuma-devel
+%endif
 %if %{with haddock}
 Suggests:       %{name}-doc = %{version}-%{release}
 Suggests:       %{name}-doc-index = %{version}-%{release}
@@ -160,15 +172,11 @@ Haskell home page at <http://www.haskell.org/>.
 %package compiler
 Summary:        GHC compiler and utilities
 License:        BSD-3-Clause
+Requires:       %{name}-filesystem = %{version}-%{release}
 Requires:       gcc
 Requires:       ghc-base-devel = %{base_ver}-%{release}
-Requires:       %{name}-filesystem = %{version}-%{release}
 Provides:       hsc2hs = %{hsc2hs_ver}-%{release}
-Obsoletes:      %{name}-ghc-internal < 9.1202.0-%{release}
-Obsoletes:      %{name}-ghc-internal-devel < 9.1202.0-%{release}
-Obsoletes:      %{name}-ghc-internal-doc < 9.1202.0-%{release}
-Obsoletes:      %{name}-ghc-internal-prof < 9.1202.0-%{release}
-%ifarch %{ghc_llvm_archs}
+%ifarch riscv64 s390x
 Requires:       clang%{llvm_major}
 Requires:       llvm%{llvm_major}
 %endif
@@ -184,7 +192,6 @@ To install all of GHC install package ghc.
 %package doc
 Summary:        Haskell library documentation meta package
 License:        BSD-3-Clause
-BuildArch:      noarch
 
 %description doc
 Installing this package causes %{name}-*-doc packages corresponding to
@@ -209,7 +216,6 @@ This package provides some common directories used for
 Haskell libraries documentation.
 %endif
 
-
 %if %{with manual}
 %package manual
 Summary:        GHC manual
@@ -221,54 +227,48 @@ BuildArch:      noarch
 This package provides the User Guide and Haddock manual.
 %endif
 
-
 %global ghc_version_override %{version}
 %global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
 %global version %{ghc_version_override}
+%if %{with_libnuma}
+%define libnuma_dep ,libnuma-devel
+%else
+%define libnuma_dep %{nil}
+%endif
 #!ForceMultiversion
-%ghc_lib_subpackage -d Cabal-%{cabal_ver}
-%ghc_lib_subpackage -d Cabal-syntax-%{cabal_ver}
+%ghc_lib_subpackage -d Cabal-3.10.3.0
+%ghc_lib_subpackage -d Cabal-syntax-3.10.3.0
 %ghc_lib_subpackage -d array-0.5.8.0
-%ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel,libnuma-devel base-%{base_ver}
-%ghc_lib_subpackage -d binary-0.8.9.3
-%ghc_lib_subpackage -d bytestring-0.12.2.0
-%ghc_lib_subpackage -d containers-0.7
-%ghc_lib_subpackage -d deepseq-1.5.1.0
-%ghc_lib_subpackage -d directory-1.3.9.0
-%ghc_lib_subpackage -d exceptions-0.10.9
-%ghc_lib_subpackage -d filepath-1.5.4.0
-%ghc_lib_subpackage -d -x ghc-%{ghc_version_override}
+%ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-%{base_ver}
+%ghc_lib_subpackage -d binary-0.8.9.1
 %ghc_lib_subpackage -d -x ghc-bignum-%{ghc_bignum_ver}
+%ghc_lib_subpackage -d bytestring-0.12.1.0
+%ghc_lib_subpackage -d containers-0.6.8
+%ghc_lib_subpackage -d deepseq-1.5.1.0
+%ghc_lib_subpackage -d directory-1.3.8.5
+%ghc_lib_subpackage -d exceptions-0.10.7
+%ghc_lib_subpackage -d filepath-1.4.200.1
+%ghc_lib_subpackage -d -x ghc-%{ghc_version_override}
 %ghc_lib_subpackage -d -x ghc-boot-%{ghc_version_override}
 %ghc_lib_subpackage -d ghc-boot-th-%{ghc_version_override}
 %ghc_lib_subpackage -d -x ghc-compact-%{ghc_compact_ver}
-%ghc_lib_subpackage -d ghc-experimental-%{ghc_ver_for_lib}
-%ghc_lib_subpackage -d ghc-internal-%{ghc_ver_for_lib}
 %ghc_lib_subpackage -d -x ghc-heap-%{ghc_version_override}
 %ghc_lib_subpackage -d -x ghci-%{ghc_version_override}
 %ghc_lib_subpackage -d haskeline-0.8.2.1
 %ghc_lib_subpackage -d -x hpc-%{hpc_ver}
 %ghc_lib_subpackage -d mtl-2.3.1
-%ghc_lib_subpackage -d parsec-3.1.18.0
+%ghc_lib_subpackage -d parsec-3.1.17.0
 %ghc_lib_subpackage -d pretty-1.1.3.6
 %ghc_lib_subpackage -d process-1.6.25.0
-%ghc_lib_subpackage -d stm-2.5.3.1
 %ghc_lib_subpackage -d semaphore-compat-1.0.0
-%ghc_lib_subpackage -d template-haskell-2.23.0.0
-%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.7
-%ghc_lib_subpackage -d text-2.1.2
-%ghc_lib_subpackage -d time-1.14
-%ghc_lib_subpackage -d transformers-0.6.1.2
-%ghc_lib_subpackage -d unix-2.8.6.0
-%ghc_lib_subpackage -d xhtml-%{xhtml_ver}
-# new in 9.10 
-%ghc_lib_subpackage -d os-string-2.0.7
-%ghc_lib_subpackage -d ghc-toolchain-0.1.0.0
-%ghc_lib_subpackage -d ghc-platform-0.1.0.0
-# new in 9.12
-%ghc_lib_subpackage -d haddock-library-1.11.0
-%ghc_lib_subpackage -d haddock-api-%{haddock_api_ver}
-%ghc_lib_subpackage -d file-io-0.1.5 
+%ghc_lib_subpackage -d stm-2.5.3.1
+%ghc_lib_subpackage -d template-haskell-2.21.0.0
+%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.6
+%ghc_lib_subpackage -d text-2.1.1
+%ghc_lib_subpackage -d time-1.12.2
+%ghc_lib_subpackage -d transformers-0.6.1.0
+%ghc_lib_subpackage -d unix-2.8.4.0
+%ghc_lib_subpackage -d xhtml-3000.2.2.1
 
 %global version %{ghc_version_override}
 
@@ -298,21 +298,20 @@ Installing this package causes %{name}-*-prof packages corresponding to
 %setup -q
 %patch -P 1 -p1
 %patch -P 2 -p1
-cd libraries/Cabal
+%ifarch s390x
 %patch -P 3 -p1
-cd ../..
-
-%ifarch ppc64le s390x
+%endif
+%patch -P 100 -p1
+%patch -P 101 -p1
+%ifarch ppc64le s390x riscv64
 %patch -P 200 -p1
 %endif
 
-%patch -P 400 -p1
-
 rm libffi-tarballs/libffi-*.tar.gz
 
 %build
 cp %{SOURCE4} ./
-hadrian/bootstrap/bootstrap.py --bootstrap-sources 9_8_2-bootstrap-sources.tar.gz
+hadrian/bootstrap/bootstrap.py --bootstrap-sources 9_4_4-bootstrap-sources.tar.gz
 
 %global hadrian _build/bin/hadrian
 
@@ -353,9 +352,9 @@ python3 boot.source --hadrian
 %endif
 %global jobs_nr %{?_smp_mflags}
 %else
-%global jobs_nr -j1 
+%global jobs_nr -j1
 %endif
-%{hadrian} %{jobs_nr} --flavour=%{?with_quickbuild:quick+no_profiled_libs}%{!?with_quickbuild:release%{!?with_ghc_prof:+no_profiled_libs}}%{?hadrian_llvm} %{hadrian_docs} binary-dist-dir --hash-unit-ids
+%{hadrian} %{jobs_nr} --flavour=%{?with_quickbuild:quick+no_profiled_libs}%{!?with_quickbuild:perf%{!?with_ghc_prof:+no_profiled_libs}}%{?hadrian_llvm} %{hadrian_docs} binary-dist-dir --hash-unit-ids
 
 %install
 
@@ -364,60 +363,48 @@ cd _build/bindist/ghc-%{version}-*
 ./configure --prefix=%{buildroot}%{ghclibdir} --bindir=%{buildroot}%{_bindir} --libdir=%{buildroot}%{_libdir} --mandir=%{buildroot}%{_mandir} --docdir=%{buildroot}%{_docdir}/%{name}-%{version}
 make install
 )
-
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-
-export LD_PATH=$(realpath %{buildroot}%{ghclibplatform} | sed "s|^%{buildroot}||")
-echo "${LD_PATH}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+echo "%{ghclibplatform}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
 
 # avoid 'E: binary-or-shlib-defines-rpath'
 for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do
   chrpath -d $i
 done
 
-
 %if %{with haddock}
 # remove short hashes
 for d in %{buildroot}%{ghc_html_libraries_dir}/*/; do
-  mv $d $(echo $d | sed -e "s/\(.*\)-.*/\\1/")
+mv $d $(echo $d | sed -e "s/\(.*\)-.*/\\1/")
 done
 %endif
- 
+
 # containers src moved to a subdir
 cp -p libraries/containers/containers/LICENSE libraries/containers/LICENSE
 # hack for Cabal-syntax/LICENSE
 mkdir -p libraries/Cabal-syntax
 cp -p libraries/Cabal/Cabal-syntax/LICENSE libraries/Cabal-syntax
-# hack for ghc-toolchain
-mkdir -p libraries/ghc-toolchain
-cp -p LICENSE libraries/ghc-toolchain
-# hacks for haddock libs
-mkdir -p libraries/haddock-api libraries/haddock-library
-cp -p utils/haddock/haddock-api/LICENSE libraries/haddock-api
-cp -p utils/haddock/haddock-library/LICENSE libraries/haddock-library
 
 rm -f %{name}-*.files
 
-
 # FIXME replace with ghc_subpackages_list
 for i in %{ghc_packages_list}; do
-  name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
-  ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
-  %ghc_gen_filelists $name $ver
-  echo "%%license libraries/$name/LICENSE" >> %{name}-$name.files
+name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
+ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
+%ghc_gen_filelists $name $ver
+echo "%%license libraries/$name/LICENSE" >> %{name}-$name.files
 done
 
 echo "%%dir %{ghclibdir}" >> %{name}-base%{?_ghcdynlibdir:-devel}.files
 
 %ghc_gen_filelists ghc %{ghc_version_override}
-%ghc_gen_filelists ghc-bignum %{ghc_bignum_ver}
 %ghc_gen_filelists ghc-boot %{ghc_version_override}
+%ghc_gen_filelists ghc-bignum %{ghc_bignum_ver}
 %ghc_gen_filelists ghc-compact %{ghc_compact_ver}
 %ghc_gen_filelists ghc-heap %{ghc_version_override}
 %ghc_gen_filelists ghci %{ghc_version_override}
 %ghc_gen_filelists hpc %{hpc_ver}
 
-%ghc_gen_filelists ghc-prim 0.13.0
+%ghc_gen_filelists ghc-prim 0.11.0
 %ghc_gen_filelists integer-gmp 1.1
 %ghc_gen_filelists rts 1.0.2
 
@@ -436,13 +423,13 @@ fi
 
 %if %{with ghc_prof}
 ls %{buildroot}%{ghclibdir}/bin/ghc-iserv-prof* >> %{name}-base-prof.files
+ls %{buildroot}%{ghclibdir}/lib/bin/ghc-iserv-prof >> %{name}-base-prof.files
 echo "%%dir %{ghcliblib}/bin"
 %endif
 
 sed -i -e "s|^%{buildroot}||g" %{name}-base*.files
 sed -i -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/*
 
-
 %if %{with haddock}
 rm %{buildroot}%{_docdir}/ghc-%{version}/archives/libraries.html.tar.xz
 %endif
@@ -451,28 +438,32 @@ rm %{buildroot}%{_docdir}/ghc-%{version}/archives/Haddock.html.tar.xz
 rm %{buildroot}%{_docdir}/ghc-%{version}/archives/users_guide.html.tar.xz
 %endif
 
-
 mkdir -p %{buildroot}%{_mandir}/man1
 install -p -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/ghc-pkg.1
 install -p -m 0644 %{SOURCE6} %{buildroot}%{_mandir}/man1/haddock.1
 install -p -m 0644 %{SOURCE7} %{buildroot}%{_mandir}/man1/runghc.1
 
-
 rm %{buildroot}%{ghclibdir}/lib/package.conf.d/.stamp
 rm %{buildroot}%{ghclibdir}/lib/package.conf.d/*.conf.copy
 
 # https://gitlab.haskell.org/ghc/ghc/-/issues/24121
-#rm %{buildroot}%{ghclibdir}/share/doc/%{ghcplatform}/*/LICENSE
-# something ugly in haddock build it's copy of ghc docu in totaly wrong place, similiary to license files
-rm -Rf %{buildroot}%{ghclibdir}/share
+rm %{buildroot}%{ghclibdir}/share/doc/%{ghcplatform}/*/LICENSE
 
+(
+cd %{buildroot}%{ghclibdir}/lib/bin
+for i in *; do
+  if [ -f %{buildroot}%{ghclibdir}/bin/$i ]; then
+     ln -sf ../../bin/$i
+  fi
+done
+)
 
 %check
 # Actually, I took this from Jens Petersen's Fedora package
 # stolen from ghc6/debian/rules:
 #Do some very simple tests that the compiler actually works
 export LANG=C.utf8
-export LD_LIBRARY_PATH=$(realpath %{buildroot}%{ghclibplatform}):
+export LD_LIBRARY_PATH=%{buildroot}%{ghclibplatform}:
 GHC=%{buildroot}%{ghclibdir}/bin/ghc
 # Do some very simple tests that the compiler actually works
 rm -rf testghc
@@ -500,7 +491,6 @@ $GHC --info
 %ghc_pkg_recache
 %end
 
-
 %files
 %license LICENSE
 
@@ -528,18 +518,17 @@ $GHC --info
 %dir %{ghcliblib}
 %dir %{ghcliblib}/%{ghcplatform}
 %dir %{ghclibdir}/bin
+%dir %{ghcliblib}/bin
 %{ghclibdir}/bin/ghc
 %{ghclibdir}/bin/ghc-iserv
 %{ghclibdir}/bin/ghc-iserv-dyn
 %{ghclibdir}/bin/ghc-pkg
-%{ghclibdir}/bin/ghc-toolchain-bin
 %{ghclibdir}/bin/hpc
 %{ghclibdir}/bin/hsc2hs
 %{ghclibdir}/bin/runghc
 %{ghclibdir}/bin/hp2ps
 %{ghclibdir}/bin/unlit
 %{ghclibdir}/bin/ghc-%{version}
-%{ghclibdir}/bin/ghc-toolchain-bin-ghc-%{version}
 %{ghclibdir}/bin/ghc-iserv-ghc-%{version}
 %{ghclibdir}/bin/ghc-iserv-dyn-ghc-%{version}
 %{ghclibdir}/bin/ghc-pkg-%{version}
@@ -552,14 +541,14 @@ $GHC --info
 %{ghclibdir}/bin/runhaskell
 %{ghclibdir}/bin/runhaskell-%{version}
 %{ghclibdir}/bin/unlit-ghc-%{version}
+%{ghclibdir}/lib/bin/ghc-iserv
+%{ghclibdir}/lib/bin/ghc-iserv-dyn
+%{ghclibdir}/lib/bin/unlit
 %{ghcliblib}/ghc-interp.js
 %{ghcliblib}/ghc-usage.txt
 %{ghcliblib}/ghci-usage.txt
 %{ghcliblib}/llvm-passes
 %{ghcliblib}/llvm-targets
-%{ghcliblib}/post-link.mjs
-%{ghcliblib}/prelude.mjs
-%{ghcliblib}/dyld.mjs
 %dir %{ghcliblib}/package.conf.d
 %ghost %{ghcliblib}/package.conf.d/package.cache
 %{ghcliblib}/package.conf.d/package.cache.lock

gnu23-hp2ps.patch

@@ -1,24 +0,0 @@
-Index: ghc-9.12.2/utils/hp2ps/Utilities.c
-===================================================================
---- ghc-9.12.2.orig/utils/hp2ps/Utilities.c
-+++ ghc-9.12.2/utils/hp2ps/Utilities.c
-@@ -1,10 +1,9 @@
- #include "Main.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "Error.h"
- 
--extern void* malloc();
--
- char*
- Basename(char *name)
- {
-@@ -89,7 +88,6 @@ void *
- xrealloc(void *p, size_t n)
- {
-     void *r;
--    extern void *realloc();
- 
-     r = realloc(p, n);
-     if (!r) {