diff --git a/ghc9.4.spec b/ghc9.4.spec index 5940263..19a2c27 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -49,7 +49,7 @@ # no longer build testsuite (takes time and not really being used) %bcond_with testsuite -# 9.2 needs llvm 9-12 +# 9.4 needs llvm 10-13 %global llvm_major 12 %if %{with hadrian} %global ghc_llvm_archs armv7hl s390x @@ -65,7 +65,7 @@ Version: 9.4.0.20220501 # - 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: 10%{?dist} +Release: 1%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -83,7 +83,7 @@ Patch2: ghc-Cabal-install-PATH-warning.patch Patch3: ghc-gen_contents_index-nodocs.patch # https://phabricator.haskell.org/rGHC4eebc8016f68719e1ccdf460754a97d1f4d6ef05 Patch6: ghc-8.6.3-sphinx-1.8.patch -## https://gitlab.haskell.org/ghc/ghc/-/issues/19684 +## DerivedConstants.h https://gitlab.haskell.org/ghc/ghc/-/issues/19684 #Patch10: https://gitlab.haskell.org/ghc/ghc/-/commit/9aace0eaf6279f17368a1753b65afbdc466e8291.patch # armv7hl patches @@ -139,9 +139,7 @@ BuildRequires: gcc-c++ # for terminfo BuildRequires: ncurses-devel BuildRequires: perl-interpreter -%if %{with testsuite} BuildRequires: python3 -%endif %if %{with manual} BuildRequires: python3-sphinx %endif @@ -307,6 +305,7 @@ 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 Cabal-3.7.0.0 +%ghc_lib_subpackage -d -l BSD Cabal-syntax-3.7.0.0 %ghc_lib_subpackage -d -l %BSDHaskellReport array-0.5.4.0 %if %{with hadrian} %ghc_lib_subpackage -d -l %BSDHaskellReport -c gmp-devel%{?_isa} base-%{base_ver} @@ -386,9 +385,8 @@ Installing this package causes %{name}-*-prof packages corresponding to %patch6 -p1 -b .orig #%%patch10 -p1 -b .orig -%if %{without hadrian} -rm -r libffi-tarballs -%endif +#rm -r libffi-tarballs +#sed -i -e '/libffi-tarballs/d' packages %ifarch armv7hl %patch12 -p1 -b .orig @@ -401,9 +399,11 @@ rm -r libffi-tarballs %endif # bigendian -%ifarch s390x && %{without hadrian} +%if %{without hadrian} +%ifarch s390x %patch18 -p1 -b .orig %endif +%endif #debian #%%patch24 -p1 -b .orig @@ -453,7 +453,7 @@ EOF %build autoupdate -./boot +./boot # --hadrian # for patch12 %ifarch armv7hl autoreconf @@ -537,6 +537,11 @@ sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_ghcdynl # 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 + +rm -f %{name}-*.files # FIXME replace with ghc_subpackages_list for i in %{ghc_packages_list}; do @@ -785,10 +790,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %{ghclibdir}/lib/bin/ghc-iserv %{ghclibdir}/lib/bin/ghc-iserv-dyn %{ghclibdir}/lib/bin/unlit -%{ghclibdir}/lib/DerivedConstants.h -%{ghclibdir}/lib/ghcautoconf.h -%{ghclibdir}/lib/ghcplatform.h -%{ghclibdir}/lib/ghcversion.h +#%%{ghclibdir}/lib/DerivedConstants.h +#%%{ghclibdir}/lib/ghcautoconf.h +#%%{ghclibdir}/lib/ghcplatform.h +#%%{ghclibdir}/lib/ghcversion.h %endif %{ghcliblib}/ghc-usage.txt %{ghcliblib}/ghci-usage.txt @@ -811,8 +816,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %if %{with haddock} %if %{without hadrian} %{ghclibdir}/bin/haddock -%{ghc_html_libraries_dir}/prologue.txt %endif +%{ghc_html_libraries_dir}/prologue.txt +%{ghc_html_libraries_dir}/linters-common %verify(not size mtime) %{ghc_html_libraries_dir}/haddock-bundle.min.js %verify(not size mtime) %{ghc_html_libraries_dir}/linuwial.css %verify(not size mtime) %{ghc_html_libraries_dir}/quick-jump.css @@ -844,9 +850,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %endif %files doc-index -%if %{without hadrian} %{ghc_html_libraries_dir}/gen_contents_index -%endif %verify(not size mtime) %{ghc_html_libraries_dir}/doc-index*.html %verify(not size mtime) %{ghc_html_libraries_dir}/index*.html %endif @@ -876,39 +880,6 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %changelog -* Sun May 1 2022 Jens Petersen - 9.2.2-9 -- ghc9.2 now recommends ghc9.2-compiler-default -- recommends zlib-devel was moved to cabal-install/stack - -* Sat Mar 12 2022 Jens Petersen - 9.2.2-8 -- https://downloads.haskell.org/~ghc/9.2.2/docs/html/users_guide/9.2.2-notes.html -- use llvm12 for aarch64 and s390x - -* Thu Jan 20 2022 Fedora Release Engineering - 9.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Jan 08 2022 Miro Hrončok - 9.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 - -* Fri Dec 31 2021 Jens Petersen - 9.2.1-5 -- enable the armv7 VFPv3D16 patch - -* Wed Dec 29 2021 Jens Petersen - 9.2.1-4 -- place docs under ghc9.2, so they can also be parallel installed -- make hadrian perf build respect ghc_prof - -* Mon Dec 27 2021 Jens Petersen - 9.2.1-3 -- compiler-default subpackage can provide the unversioned bindir files - -* Mon Dec 20 2021 Jens Petersen - 9.2.1-2 -- build with ghc's Hadrian buildsystem -- s390x now uses the llvm backend -- manuals created by sphinx disabled for now -- ghc-iserv-prof now lives in ghc-base-prof -- add hadrian subpackage -- move the haddock index files into doc-index - -* Wed Dec 8 2021 Jens Petersen - 9.2.1-1 -- initial ghc9.2 package derived from the ghc:9.2 module -- https://downloads.haskell.org/ghc/9.2.1/docs/html/users_guide/9.2.1-notes.html -- see the Fedora ghc:9.2 branch for earlier packaging changes +* Sat May 7 2022 Jens Petersen - 9.4.0.20220501-1 +- 9.4.1-alpha1 +- derived from the ghc9.2 package