From 3aa816c924e53791cca88c295d632a71b934cb39 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 29 Mar 2022 12:57:25 +0800 Subject: [PATCH] update to 8.10.7 --- .gitignore | 1 + ...25fa5f0fce033b529547e0658076e26f4cda.patch | 39 ----------- ghc-userguide-sphinx4.patch | 11 ---- ghc.spec | 65 ++++++------------- sources | 3 +- 5 files changed, 23 insertions(+), 96 deletions(-) delete mode 100644 296f25fa5f0fce033b529547e0658076e26f4cda.patch delete mode 100644 ghc-userguide-sphinx4.patch diff --git a/.gitignore b/.gitignore index 0a57be4..21e8e7b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ testsuite-6.12.3.tar.bz2 /ghc-8.10.5-src.tar.xz.sig /ghc-8.10.5-src.tar.xz /ghc-8.10.4-src.tar.xz.sig +/ghc-8.10.7-src.tar.xz diff --git a/296f25fa5f0fce033b529547e0658076e26f4cda.patch b/296f25fa5f0fce033b529547e0658076e26f4cda.patch deleted file mode 100644 index 813c500..0000000 --- a/296f25fa5f0fce033b529547e0658076e26f4cda.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 296f25fa5f0fce033b529547e0658076e26f4cda Mon Sep 17 00:00:00 2001 -From: Adam Sandberg Ericsson -Date: Wed, 28 Apr 2021 20:11:52 +0100 -Subject: [PATCH] rts: export allocateWrite, freeWrite and markExec #19763 - -(cherry picked from commit 2d2985a79eec3d6ae9aee96b264c97c2b158f196) ---- - rts/RtsSymbols.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c -index 9ca696c27c4..d5b8cc5fece 100644 ---- a/rts/RtsSymbols.c -+++ b/rts/RtsSymbols.c -@@ -539,11 +539,21 @@ - #define RTS_PROF_SYMBOLS /* empty */ - #endif - -+#if RTS_LINKER_USE_MMAP -+#define RTS_LINKER_USE_MMAP_SYMBOLS \ -+ SymI_HasProto(allocateWrite) \ -+ SymI_HasProto(freeWrite) \ -+ SymI_HasProto(markExec) -+#else -+#define RTS_LINKER_USE_MMAP_SYMBOLS /* empty */ -+#endif -+ - #define RTS_SYMBOLS \ - Maybe_Stable_Names \ - RTS_TICKY_SYMBOLS \ - RTS_PROF_SYMBOLS \ - RTS_LIBDW_SYMBOLS \ -+ RTS_LINKER_USE_MMAP_SYMBOLS \ - SymI_HasProto(StgReturn) \ - SymI_HasProto(stg_gc_noregs) \ - SymI_HasProto(stg_ret_v_info) \ --- -GitLab - diff --git a/ghc-userguide-sphinx4.patch b/ghc-userguide-sphinx4.patch deleted file mode 100644 index 8c31df1..0000000 --- a/ghc-userguide-sphinx4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ghc-8.8.4/docs/users_guide/conf.py~ 2020-07-09 00:43:03.000000000 +0800 -+++ ghc-8.8.4/docs/users_guide/conf.py 2021-07-01 00:09:03.537324304 +0800 -@@ -77,7 +77,7 @@ - latex_elements = { - 'inputenc': '', - 'utf8extra': '', -- 'preamble': ''' -+ 'preamble': r''' - \usepackage{fontspec} - \usepackage{makeidx} - \setsansfont{DejaVu Sans} diff --git a/ghc.spec b/ghc.spec index fe9a119..41311ac 100644 --- a/ghc.spec +++ b/ghc.spec @@ -8,7 +8,7 @@ # to handle RCs %global ghc_release %{version} -%global base_ver 4.14.2.0 +%global base_ver 4.14.3.0 # build profiling libraries # build haddock @@ -24,12 +24,6 @@ %bcond_without perf_build %endif -# to enable dwarf info (only on intel archs): overrides perf -# default is off: bcond_with -%ifarch x86_64 i686 -%bcond_with dwarf -%endif - # locked together since disabling haddock causes no manuals built # and disabling haddock still created index.html # https://ghc.haskell.org/trac/ghc/ticket/15190 @@ -38,19 +32,19 @@ # no longer build testsuite (takes time and not really being used) %bcond_with testsuite -# 8.10.5 can use llvm 9-12 +# 8.10 can use llvm 9-12 %global llvm_major 11 %global ghc_llvm_archs armv7hl aarch64 %global ghc_unregisterized_arches s390 s390x %{mips} riscv64 Name: ghc -Version: 8.10.5 +Version: 8.10.7 # Since library subpackages are versioned: # - 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: 115%{?dist} +Release: 116%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -59,7 +53,6 @@ Source0: https://downloads.haskell.org/ghc/%{ghc_release}/ghc-%{version}-src.tar %if %{with testsuite} Source1: https://downloads.haskell.org/ghc/%{ghc_release}/ghc-%{version}-testsuite.tar.xz %endif -Source2: https://downloads.haskell.org/ghc/%{ghc_release}/ghc-%{version}-src.tar.xz.sig Source5: ghc-pkg.man Source6: haddock.man Source7: runghc.man @@ -69,11 +62,6 @@ 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/19763 -# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/5915 -Patch7: https://gitlab.haskell.org/ghc/ghc/-/commit/296f25fa5f0fce033b529547e0658076e26f4cda.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1977317 -Patch8: ghc-userguide-sphinx4.patch # Arch dependent patches # arm @@ -99,7 +87,8 @@ Patch26: no-missing-haddock-file-warning.patch # fedora ghc has been bootstrapped on # %%{ix86} x86_64 ppc ppc64 armv7hl s390 s390x ppc64le aarch64 # and retired arches: alpha sparcv9 armv5tel -# see also deprecated ghc_arches defined in /etc/rpm/macros.ghc-srpm by redhat-rpm-macros +# see also deprecated ghc_arches defined in ghc-srpm-macros +# /usr/lib/rpm/macros.d/macros.ghc-srpm BuildRequires: ghc-compiler > 8.6 # for ABI hash checking @@ -113,6 +102,8 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-pretty-devel BuildRequires: ghc-process-devel +BuildRequires: ghc-stm-devel +BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-transformers-devel BuildRequires: alex BuildRequires: gmp-devel @@ -131,16 +122,10 @@ BuildRequires: python3-sphinx %ifarch %{ghc_llvm_archs} BuildRequires: llvm%{llvm_major} %endif -%if %{with dwarf} -BuildRequires: elfutils-devel -%endif %ifarch armv7hl # patch12 BuildRequires: autoconf, automake %endif -%if %{without quickbuild} -#BuildRequires: gnupg2 -%endif Requires: ghc-compiler = %{version}-%{release} Requires: ghc-devel = %{version}-%{release} Requires: ghc-ghc-devel = %{version}-%{release} @@ -245,7 +230,7 @@ This package provides the User Guide and Haddock manual. %ghc_lib_subpackage -d -l %BSDHaskellReport -c gmp-devel%{?_isa},libffi-devel%{?_isa} base-%{base_ver} %ghc_lib_subpackage -d -l BSD binary-0.8.8.0 %ghc_lib_subpackage -d -l BSD bytestring-0.10.12.0 -%ghc_lib_subpackage -d -l %BSDHaskellReport containers-0.6.4.1 +%ghc_lib_subpackage -d -l %BSDHaskellReport containers-0.6.5.1 %ghc_lib_subpackage -d -l %BSDHaskellReport deepseq-1.4.4.0 %ghc_lib_subpackage -d -l %BSDHaskellReport directory-1.3.6.0 %ghc_lib_subpackage -d -l %BSDHaskellReport exceptions-0.10.4 @@ -258,14 +243,14 @@ This package provides the User Guide and Haddock manual. %ghc_lib_subpackage -d -l BSD ghc-heap-%{ghc_version_override} # see below for ghc-prim %ghc_lib_subpackage -d -l BSD -x ghci-%{ghc_version_override} -%ghc_lib_subpackage -d -l BSD haskeline-0.8.0.1 +%ghc_lib_subpackage -d -l BSD haskeline-0.8.2 %ghc_lib_subpackage -d -l BSD hpc-0.6.1.0 # see below for integer-gmp %ghc_lib_subpackage -d -l %BSDHaskellReport libiserv-%{ghc_version_override} %ghc_lib_subpackage -d -l BSD mtl-2.2.2 %ghc_lib_subpackage -d -l BSD parsec-3.1.14.0 %ghc_lib_subpackage -d -l BSD pretty-1.1.3.6 -%ghc_lib_subpackage -d -l %BSDHaskellReport process-1.6.9.0 +%ghc_lib_subpackage -d -l %BSDHaskellReport process-1.6.13.2 %ghc_lib_subpackage -d -l BSD stm-2.5.0.1 %ghc_lib_subpackage -d -l BSD template-haskell-2.16.0.0 %ghc_lib_subpackage -d -l BSD -c ncurses-devel%{?_isa} terminfo-0.4.1.4 @@ -306,9 +291,6 @@ packages to be automatically installed too. %prep -%if %{without quickbuild} -#%%{gpgverify} --keyring='%{SOURCE3}' --signature='%{SOURCE2}' --data='%{SOURCE0}' -%endif %setup -q -n %{name}-%{version} %{?with_testsuite:-b1} %patch1 -p1 -b .orig @@ -316,13 +298,11 @@ packages to be automatically installed too. %patch2 -p1 -b .orig %patch6 -p1 -b .orig -%patch7 -p1 -b .orig -%patch8 -p1 -b .orig rm -r libffi-tarballs %ifarch armv7hl -%patch12 -p1 -b .orig +%patch12 -p1 -b .orig12 %endif # remove s390x after switching to llvm @@ -339,8 +319,8 @@ rm -r libffi-tarballs %patch24 -p1 -b .orig %patch26 -p1 -b .orig -%global gen_contents_index gen_contents_index.orig %if %{with haddock} +%global gen_contents_index gen_contents_index.orig if [ ! -f "libraries/%{gen_contents_index}" ]; then echo "Missing libraries/%{gen_contents_index}, needed at end of %%install!" exit 1 @@ -353,12 +333,8 @@ cat > mk/build.mk << EOF %ifarch %{ghc_llvm_archs} BuildFlavour = perf-llvm %else -%if %{with dwarf} -BuildFlavour = dwarf -%else BuildFlavour = perf %endif -%endif %else %ifarch %{ghc_llvm_archs} BuildFlavour = quick-llvm @@ -390,7 +366,6 @@ autoreconf %endif %ghc_set_gcc_flags -# for ghc >= 8.2 export CC=%{_bindir}/gcc # * %%configure induces cross-build due to different target/host/build platform names @@ -404,7 +379,6 @@ export CC=%{_bindir}/gcc %ifarch %{ghc_unregisterized_arches} --enable-unregisterised \ %endif - %{?with_dwarf:--enable-dwarf-unwind} \ %{nil} # avoid "ghc: hGetContents: invalid argument (invalid byte sequence)" @@ -447,8 +421,8 @@ done echo "%%dir %{ghclibdir}" >> ghc-base%{?_ghcdynlibdir:-devel}.files echo "%{ghclibdir}/include" >> ghc-base-devel.files -%ghc_gen_filelists ghc-boot %{ghc_version_override} %ghc_gen_filelists ghc %{ghc_version_override} +%ghc_gen_filelists ghc-boot %{ghc_version_override} %ghc_gen_filelists ghci %{ghc_version_override} %ghc_gen_filelists ghc-prim 0.6.1 %ghc_gen_filelists integer-gmp 1.0.3.0 @@ -461,8 +435,8 @@ for i in devel doc prof; do\ cat ghc-%1-$i.files >> ghc-%2-$i.files\ done -%merge_filelist integer-gmp base %merge_filelist ghc-prim base +%merge_filelist integer-gmp base # add rts libs rm -f rts.files @@ -493,7 +467,7 @@ export RPM_BUILD_NCPUS=1 %check -export LANG=en_US.utf8 +export LANG=C.utf8 # stolen from ghc6/debian/rules: GHC=inplace/bin/ghc-stage2 # Do some very simple tests that the compiler actually works @@ -502,8 +476,6 @@ mkdir testghc echo 'main = putStrLn "Foo"' > testghc/foo.hs $GHC testghc/foo.hs -o testghc/foo [ "$(testghc/foo)" = "Foo" ] -# doesn't seem to work inplace: -#[ "$(inplace/bin/runghc testghc/foo.hs)" = "Foo" ] rm testghc/* echo 'main = putStrLn "Foo"' > testghc/foo.hs $GHC testghc/foo.hs -o testghc/foo -O2 @@ -514,6 +486,8 @@ $GHC testghc/foo.hs -o testghc/foo -dynamic [ "$(testghc/foo)" = "Foo" ] rm testghc/* +$GHC --info + # check the ABI hashes %if %{with abicheck} if [ "%{version}" = "$(ghc --numeric-version)" ]; then @@ -663,6 +637,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %changelog +* Tue Mar 29 2022 Jens Petersen - 8.10.7-116 +- https://downloads.haskell.org/~ghc/8.10.7/docs/html/users_guide/8.10.7-notes.html + * Fri Sep 17 2021 Jens Petersen - move zlib-devel Recommends to cabal-install diff --git a/sources b/sources index b5e2cf4..6645ec0 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ghc-8.10.5-src.tar.xz.sig) = c9d1abf8f4065c1935be877b4978638130307afbfef988ac16d7c972e502b71056a5e5acc1b54b903d8f939a0f2e3ec4ad953cdc7a9ce21024f398ce84cfb2da -SHA512 (ghc-8.10.5-src.tar.xz) = b5f39be0accd5c1cecf1cc326ba3142f561d2ac93e9abf366fe46307d7c0712aac244836e659e1a4d9d0fb98299ea96edc8e8a06f3a81b528b14914b94057ffe +SHA512 (ghc-8.10.7-src.tar.xz) = eaf35de6da9b196f1e26bbbb681d60e4fe5f94a9e2af265a1ea5b5aef8ad2b10848ff946eb61d128095002624aced52c01c7f8cf1d72fd9120b8cc7762ddc3c3