[rpms/ghc9.6] rawhide: use hadrian-bootstrap-sources and bundled Cabal to build hadrian (#2503916)

[rpms/ghc9.6] rawhide: use hadrian-bootstrap-sources and bundled Cabal to build hadrian (#2503916)

[Jens Petersen]

A new commit has been pushed.

Repo   : rpms/ghc9.6
Branch : rawhide
Commit : aabf21acad2c9d9e62f6686a1f189f9b7b3d5ad0
Author : Jens Petersen <petersen@redhat.com>
Date   : 2026-08-08T00:47:22+08:00
Stats  : +30/-20 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/ghc9.6/c/aabf21acad2c9d9e62f6686a1f189f9b7b3d5ad0?branch=rawhide

Log:
use hadrian-bootstrap-sources and bundled Cabal to build hadrian (#2503916)

---
diff --git a/.gitignore b/.gitignore
index 18051d5..5248063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /ghc-9.6.7-src.tar.lz
 /Cabal-syntax-3.6.0.0.tar.gz
 /Cabal-3.6.0.0.tar.gz
+/hadrian-bootstrap-sources-9.4.3.tar.gz

diff --git a/ghc9.6.spec b/ghc9.6.spec
index c3ae571..06072cb 100644
--- a/ghc9.6.spec
+++ b/ghc9.6.spec
@@ -14,20 +14,22 @@
 %undefine with_haddock
 %endif
 
+# tweak for ppc64le
+%global ghcplatform %(echo $(echo %{_arch} | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version_override})
+
 %global ghc_major 9.6
 %global ghc_name ghc%{ghc_major}
 
 %global base_ver 4.18.3.0
+%global Cabal_ver 3.10.3.0
 %global ghc_bignum_ver 1.3
 %global ghc_compact_ver 0.1.0.0
 %global hpc_ver 0.6.2.0
 %global rts_ver 1.0.2
 %global xhtml_ver 3000.2.2.1
 
-%global hadrian_Cabal_ver 3.6.0.0
-
 # bootstrap needs 9.2+
-%global ghcboot_major 9.4
+%global ghcboot_major 9.6
 %global ghcboot ghc%{?ghcboot_major}
 
 # make sure ghc libraries' ABI hashes unchanged
@@ -69,8 +71,8 @@ Source1: https://downloads.haskell.org/ghc/%{version}/ghc-%{version}-testsuite.t
 Source5: ghc-pkg.man
 Source6: haddock.man
 Source7: runghc.man
-Source10: https://hackage.haskell.org/package/Cabal-syntax-%{hadrian_Cabal_ver}/Cabal-syntax-%{hadrian_Cabal_ver}.tar.gz
-Source11: https://hackage.haskell.org/package/Cabal-%{hadrian_Cabal_ver}/Cabal-%{hadrian_Cabal_ver}.tar.gz
+# hadrian bootstrap libraries
+Source10: https://downloads.haskell.org/ghc/9.6.7/hadrian-bootstrap-sources/hadrian-bootstrap-sources-9.4.3.tar.gz
 
 # absolute haddock path (was for html/libraries -> libraries)
 Patch1: ghc-gen_contents_index-haddock-path.patch
@@ -158,14 +160,10 @@ BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
-BuildRequires:  ghc-extra-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-mtl-devel
-BuildRequires:  ghc-parsec-devel
-BuildRequires:  ghc-shake-devel
 BuildRequires:  ghc-stm-devel
 BuildRequires:  ghc-transformers-devel
-BuildRequires:  ghc-unordered-containers-devel
 %else
 BuildRequires:  %{name}-hadrian
 %endif
@@ -317,8 +315,8 @@ This provides the hadrian tool which can be used to build ghc.
 
 # use "./libraries-versions.sh" to check versions
 %if %{defined ghclibdir}
-%ghc_lib_subpackage -d -l BSD-3-Clause Cabal-3.10.3.0
-%ghc_lib_subpackage -d -l BSD-3-Clause Cabal-syntax-3.10.3.0
+%ghc_lib_subpackage -d -l BSD-3-Clause Cabal-%{Cabal_ver}
+%ghc_lib_subpackage -d -l BSD-3-Clause Cabal-syntax-%{Cabal_ver}
 %ghc_lib_subpackage -d -l %BSDHaskellReport array-0.5.8.0
 %ghc_lib_subpackage -d -l %BSDHaskellReport -c gmp-devel%{?_isa},libffi-devel%{?_isa} base-%{base_ver}
 %ghc_lib_subpackage -d -l BSD-3-Clause binary-0.8.9.1
@@ -384,13 +382,26 @@ Installing this package causes %{name}-*-prof packages corresponding to
 
 
 %prep
-%setup -q -n ghc-%{version} %{?with_testsuite:-b1} -a10 -a11
+%setup -q -n ghc-%{version} %{?with_testsuite:-b1}
+
+%global hadrian_deps clock-0.8.4 extra-1.8 filepattern-0.1.3 hashable-1.4.7.0 heaps-0.4.1 js-dgtable-0.5.2 js-flot-0.8.3 js-jquery-3.3.1 os-string-2.0.7 primitive-0.9.0.0 splitmix-0.1.1 random-1.2.1.3 unordered-containers-0.2.20 utf8-string-1.0.2 shake-0.19.8
+
 ( cd hadrian
   cabal-tweak-flag selftest False
   cabal-tweak-dep-ver bytestring '< 0.12' '< 0.13'
-  cabal-tweak-dep-ver Cabal '< 3.11' '< 3.13'
   cabal-tweak-dep-ver containers '< 0.7' '< 0.8'
   cabal-tweak-dep-ver directory '>= 1.3.9.0' '>= 1.3.6'
+  mkdir deps
+  (cd deps
+  tar xf %SOURCE10
+  for i in %hadrian_deps; do
+      tar xf $i.tar.gz
+      mv -f $(echo $i | sed 's/\(.*\)-.*/\1.cabal/') $i
+      mv $i ..
+  done
+  )
+  ln -sf ../libraries/Cabal/Cabal-syntax Cabal-syntax-%{Cabal_ver}
+  ln -sf ../libraries/Cabal/Cabal Cabal-%{Cabal_ver}
 )
 
 %patch -P1 -p1 -b .orig
@@ -476,11 +487,7 @@ export LANG=C.utf8
 %global ghc_debuginfo 1
 (
 cd hadrian
-%if %{defined el9}
-ln -sf ../Cabal-syntax-%{hadrian_Cabal_ver} Cabal-syntax-%{hadrian_Cabal_ver}
-ln -sf ../Cabal-%{hadrian_Cabal_ver} Cabal-%{hadrian_Cabal_ver}
-%ghc_libs_build -H -P -W Cabal-syntax-%{hadrian_Cabal_ver} Cabal-%{hadrian_Cabal_ver}
-%endif
+%ghc_libs_build -H -P -W Cabal-syntax-%{Cabal_ver} Cabal-%{Cabal_ver} %{hadrian_deps}
 %ghc_bin_build -W
 )
 %global hadrian hadrian/dist/build/hadrian/hadrian
@@ -835,6 +842,9 @@ make test
 
 
 %changelog
+* Fri Aug 07 2026 Jens Petersen <petersen@redhat.com> - 9.6.7-27
+- use hadrian-bootstrap-sources and bundled Cabal to build hadrian (#2503916)
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9.6.7-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index 5a3fc59..fde0cc6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (ghc-9.6.7-src.tar.lz) = 38d4b8fad3d298b6ac38e462478f9fad55d9d729441094aa60d7c75df06f0ca8d916ee253576e8e91d005d516d0b6e72a15503de6d04c780961a94dfc5e7f986
-SHA512 (Cabal-syntax-3.6.0.0.tar.gz) = 6a783529be318fbc025a2ec198e663237e83b598a3f42eb3fbb7696f3b5e92fdd691f6b5af58d06ee2af5f79087ab12e78c8a3c9ea9bbcfaf6e135eceae69d77
-SHA512 (Cabal-3.6.0.0.tar.gz) = b7076aa4a9a9a6b8c1f3fceb8f70997111406b294fccf0b036f8f3bae1bbe55e2cb4ab9bd5bbb97bbcf3f36f18083f7f50cb54448f06a96cdb50bdda0fd607f9
+SHA512 (hadrian-bootstrap-sources-9.4.3.tar.gz) = 8bbe0725298ddd0e917a276dfe7f34a0f6f8bddda8e3e9351ac522f978cd46cd5da0f86daa2fb82ffc63765dafb3b444a7fef420395bec244545e8411f7ca832