add new added packages: ghc-experimental, ghc-platform, ghc-toolchain, os-string

- also libdir/lib/bin is gone

.gitignore

@@ -1 +1,2 @@
 /ghc-9.10.0.20240313-src.tar.xz
+/ghc-9.10.1-src.tar.xz

ghc9.10.spec

@@ -1,9 +1,9 @@
 # Start: prod settings
 # all *bcond_without* for production builds:
 # - performance build (disable for quick build)
-%bcond_without perfbuild
+%bcond perfbuild 1
-%bcond_without build_hadrian
+%bcond build_hadrian 1
-%bcond_without manual
+%bcond manual 1
 # End: prod settings
 
 # not for production builds
@@ -23,19 +23,22 @@
 %global base_ver 4.20.0.0
 %global ghc_bignum_ver 1.3
 %global ghc_compact_ver 0.1.0.0
+%global ghc_experimental_ver 0.1.0.0
+%global ghc_platform_ver 0.1.0.0
+%global ghc_toolchain_ver 0.1.0.0
 %global hpc_ver 0.7.0.1
 %global rts_ver 1.0.2
 %global xhtml_ver 3000.2.2.1
 
-# bootstrap needs 9.6+
+# bootstrap needs 9.6+ (& hadrian needs Cabal-3.10)
-%global ghcboot_major 9.6
+#%%global ghcboot_major 9.6
 %global ghcboot ghc%{?ghcboot_major}
 
 # make sure ghc libraries' ABI hashes unchanged
-%bcond_with abicheck
+%bcond abicheck 0
 
 # no longer build testsuite (takes time and not really being used)
-%bcond_with testsuite
+%bcond testsuite 0
 
 # use system default ld.bfd
 %bcond ld_gold 0
@@ -58,7 +61,7 @@ Version: 9.10.1
 # - release can only be reset if *all* library versions get bumped simultaneously
 #   (sometimes after a major release)
 # - minor release numbers for a branch should be incremented monotonically
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: BSD-3-Clause AND HaskellReport
@@ -134,6 +137,7 @@ BuildRequires: %{ghcboot}-text-devel
 BuildRequires: %{ghcboot}-time-devel
 BuildRequires: %{ghcboot}-transformers-devel
 BuildRequires: %{ghcboot}-unix-devel
+BuildRequires: alex
 BuildRequires: binutils%{?with_ld_gold:-gold}
 BuildRequires: gmp-devel
 BuildRequires: gcc-c++
@@ -337,15 +341,18 @@ This provides the hadrian tool which can be used to build ghc.
 %ghc_lib_subpackage -d -x -l BSD-3-Clause ghc-boot-%{ghc_version_override}
 %ghc_lib_subpackage -d -l BSD-3-Clause ghc-boot-th-%{ghc_version_override}
 %ghc_lib_subpackage -d -x -l BSD-3-Clause ghc-compact-%{ghc_compact_ver}
-%ghc_lib_subpackage -d -l BSD-3-Clause ghc-experimental-0.1.0.0
+%ghc_lib_subpackage -d -x -l BSD-3-Clause ghc-experimental-%{ghc_experimental_ver}
 %ghc_lib_subpackage -d -x -l BSD-3-Clause ghc-heap-%{ghc_version_override}
 %ghc_lib_subpackage -d -l BSD-3-Clause ghc-internal-9.1001.0
 # see below for ghc-prim
+%ghc_lib_subpackage -d -x -l BSD-3-Clause ghc-platform-%{ghc_platform_ver}
+%ghc_lib_subpackage -d -x -l BSD-3-Clause ghc-toolchain-%{ghc_toolchain_ver}
 %ghc_lib_subpackage -d -x -l BSD-3-Clause ghci-%{ghc_version_override}
 %ghc_lib_subpackage -d -l BSD-3-Clause haskeline-0.8.2.1
 %ghc_lib_subpackage -d -x -l BSD-3-Clause hpc-%{hpc_ver}
 # see below for integer-gmp
 %ghc_lib_subpackage -d -l BSD-3-Clause mtl-2.3.1
+%ghc_lib_subpackage -d -l BSD-3-Clause os-string-2.0.2
 %ghc_lib_subpackage -d -l BSD-3-Clause parsec-3.1.17.0
 %ghc_lib_subpackage -d -l BSD-3-Clause pretty-1.1.3.6
 %ghc_lib_subpackage -d -l %BSDHaskellReport process-1.6.19.0
@@ -557,7 +564,10 @@ echo "%%dir %ghclibplatform" >> %{name}-base%{?_ghcdynlibdir:-devel}.files
 %ghc_gen_filelists ghc-bignum %{ghc_bignum_ver}
 %ghc_gen_filelists ghc-boot %{ghc_version_override}
 %ghc_gen_filelists ghc-compact %{ghc_compact_ver}
+%ghc_gen_filelists ghc-experimental %{ghc_experimental_ver}
 %ghc_gen_filelists ghc-heap %{ghc_version_override}
+%ghc_gen_filelists ghc-platform %{ghc_platform_ver}
+%ghc_gen_filelists ghc-toolchain %{ghc_toolchain_ver}
 %ghc_gen_filelists ghci %{ghc_version_override}
 %ghc_gen_filelists hpc %{hpc_ver}
 
@@ -601,7 +611,6 @@ fi
 
 %if %{with ghc_prof}
 ls %{buildroot}%{ghclibdir}/bin/ghc-iserv-prof* >> %{name}-base-prof.files
-ls %{buildroot}%{ghcliblib}/bin/ghc-iserv-prof >> %{name}-base-prof.files
 %endif
 
 sed -i -e "s|^%{buildroot}||g" %{name}-base*.files
@@ -631,14 +640,6 @@ rm %{buildroot}%{ghcliblib}/package.conf.d/*.conf.copy
 # https://gitlab.haskell.org/ghc/ghc/-/issues/24121
 rm %{buildroot}%{ghclibdir}/share/doc/%ghcplatform/*/LICENSE
 
-(cd %{buildroot}%{ghcliblib}/bin
-for i in *; do
-if [ -f %{buildroot}%{ghclibdir}/bin/$i ]; then
-ln -sf ../../bin/$i
-fi
-done
-)
-
 (
 cd %{buildroot}%{_bindir}
 for i in *; do
@@ -749,6 +750,8 @@ make test
 %{ghclibdir}/bin/ghc-iserv
 %{ghclibdir}/bin/ghc-iserv-dyn
 %{ghclibdir}/bin/ghc-pkg
+%{ghclibdir}/bin/ghc-toolchain-bin
+%{ghclibdir}/bin/ghc-toolchain-bin-ghc-%{version}
 %{ghclibdir}/bin/hpc
 %{ghclibdir}/bin/hsc2hs
 %{ghclibdir}/bin/runghc
@@ -767,10 +770,6 @@ make test
 %{ghclibdir}/bin/runhaskell
 %{ghclibdir}/bin/runhaskell-%{version}
 %{ghclibdir}/bin/unlit-ghc-%{version}
-%dir %{ghcliblib}/bin
-%{ghcliblib}/bin/ghc-iserv
-%{ghcliblib}/bin/ghc-iserv-dyn
-%{ghcliblib}/bin/unlit
 %{ghcliblib}/ghc-interp.js
 %{ghcliblib}/ghc-usage.txt
 %{ghcliblib}/ghci-usage.txt
@@ -779,6 +778,8 @@ make test
 %dir %{ghcliblib}/package.conf.d
 %ghost %{ghcliblib}/package.conf.d/package.cache
 %{ghcliblib}/package.conf.d/package.cache.lock
+%{ghcliblib}/post-link.mjs
+%{ghcliblib}/prelude.js
 %{ghcliblib}/settings
 %{ghcliblib}/template-hsc.h
 %{_mandir}/man1/ghc-pkg.1*
@@ -852,6 +853,9 @@ make test
 
 
 %changelog
+* Wed Jul 31 2024 Jens Petersen <petersen@redhat.com> - 9.10.1-3
+- new packages: ghc-experimental, ghc-platform, ghc-toolchain, os-string
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ghc-9.10.0.20240313-src.tar.xz) = cea3a7c47586efd66b3396906812a8dfc876dcaa89c735ff2d2e7527d8b88b459a9591ec26c6d98ffaa2ff0fa8d76047bf9b8f22d918f798f3eda6a806c0202b
+SHA512 (ghc-9.10.1-src.tar.xz) = 46d47e7811a19dcce501002ab674d84ab2fcb842309b5094af52dc5ad26bf5b309b160c1b689f3342666013bf4b0587425c60fbd6c637e739839d41a6a96d990