From 8bb182a80d539718531c0d7689d5ea354743d1e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:07:50 +0000 Subject: [PATCH 1/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc.spec b/ghc.spec index 9fc1474..2e6a30e 100644 --- a/ghc.spec +++ b/ghc.spec @@ -43,7 +43,7 @@ Version: 8.6.5 # - 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: 100%{?dist} +Release: 101%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -672,6 +672,9 @@ make test %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 8.6.5-101 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 31 2019 Jens Petersen - 8.6.5-100 - update to GHC 8.6.5 (backport ghc:8.6 module stream) - https://downloads.haskell.org/~ghc/8.6.5/docs/html/users_guide/8.6.1-notes.html From 3a08236cd280a8b664a781d1c96b194026c8add2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 10 Feb 2020 19:30:18 +0800 Subject: [PATCH 2/6] rebuild against ghc-rpm-macros fixed for subpackage prof deps testcase: ghc-prof(...) was missing from generated Requires --- ghc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc.spec b/ghc.spec index 2e6a30e..dd93d7d 100644 --- a/ghc.spec +++ b/ghc.spec @@ -43,7 +43,7 @@ Version: 8.6.5 # - 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: 101%{?dist} +Release: 102%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -110,7 +110,7 @@ BuildRequires: ghc-compiler %if %{with abicheck} BuildRequires: ghc %endif -BuildRequires: ghc-rpm-macros-extra >= 2.0 +BuildRequires: ghc-rpm-macros-extra >= 2.0.6 BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel @@ -672,6 +672,9 @@ make test %changelog +* Mon Feb 10 2020 Jens Petersen - 8.6.5-102 +- rebuild against ghc-rpm-macros fixed for subpackage prof deps + * Tue Jan 28 2020 Fedora Release Engineering - 8.6.5-101 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a82189be912f32ed0c5cef3c46a21a3f8c7dd62e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 10 Mar 2020 20:07:34 +0800 Subject: [PATCH 3/6] add bcond for dwarf-unwind debuginfo --- ghc.spec | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ghc.spec b/ghc.spec index dd93d7d..15de414 100644 --- a/ghc.spec +++ b/ghc.spec @@ -23,6 +23,11 @@ %bcond_without perf_build %endif +# to enable dwarf-unwind debug (only on intel archs) +%ifarch x86_64 i686 +%bcond_with dwarf_unwind +%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 @@ -141,6 +146,9 @@ BuildRequires: llvm%{llvm_major} BuildRequires: llvm >= %{llvm_major} %endif %endif +%if %{with dwarf_unwind} +BuildRequires: elfutils-devel +%endif %ifarch armv7hl # patch12 BuildRequires: autoconf, automake @@ -371,6 +379,10 @@ BuildFlavour = quick %endif %endif GhcLibWays = v dyn %{?with_ghc_prof:p} +%if %{with dwarf_unwind} +GhcLibHcOpts += -g3 +GhcRtsHcOpts += -g3 +%endif %if %{with haddock} HADDOCK_DOCS = YES EXTRA_HADDOCK_OPTS += --hyperlinked-source --hoogle --quickjump @@ -418,6 +430,7 @@ export CC=%{_bindir}/gcc %ifarch %{ghc_unregisterized_arches} --enable-unregisterised \ %endif + %{?with_dwarf_unwind:--enable-dwarf-unwind} \ %{nil} # avoid "ghc: hGetContents: invalid argument (invalid byte sequence)" @@ -672,6 +685,9 @@ make test %changelog +* Tue Mar 10 2020 Jens Petersen +- add bcond for dwarf-unwind debuginfo + * Mon Feb 10 2020 Jens Petersen - 8.6.5-102 - rebuild against ghc-rpm-macros fixed for subpackage prof deps From 8d4b4ec6e945f3ac5cfd1ed59a4a9c37e2461c6d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 11 Mar 2020 00:57:22 +0800 Subject: [PATCH 4/6] rename dwarf_unwind to dwarf and use dwarf flavour --- ghc.spec | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/ghc.spec b/ghc.spec index 15de414..91e49f1 100644 --- a/ghc.spec +++ b/ghc.spec @@ -23,9 +23,10 @@ %bcond_without perf_build %endif -# to enable dwarf-unwind debug (only on intel archs) +# to enable dwarf info (only on intel archs): overrides perf +# default is off: bcond_with %ifarch x86_64 i686 -%bcond_with dwarf_unwind +%bcond_with dwarf %endif # locked together since disabling haddock causes no manuals built @@ -146,7 +147,7 @@ BuildRequires: llvm%{llvm_major} BuildRequires: llvm >= %{llvm_major} %endif %endif -%if %{with dwarf_unwind} +%if %{with dwarf} BuildRequires: elfutils-devel %endif %ifarch armv7hl @@ -369,8 +370,12 @@ 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 @@ -379,10 +384,6 @@ BuildFlavour = quick %endif %endif GhcLibWays = v dyn %{?with_ghc_prof:p} -%if %{with dwarf_unwind} -GhcLibHcOpts += -g3 -GhcRtsHcOpts += -g3 -%endif %if %{with haddock} HADDOCK_DOCS = YES EXTRA_HADDOCK_OPTS += --hyperlinked-source --hoogle --quickjump @@ -398,11 +399,6 @@ BUILD_SPHINX_HTML = NO %endif BUILD_SPHINX_PDF = NO EOF -## for verbose build output -#GhcStage1HcOpts=-v4 -## enable RTS debugging: -## (http://ghc.haskell.org/trac/ghc/wiki/Debugging/RuntimeSystem) -#EXTRA_HC_OPTS=-debug %build # for patch12 @@ -430,7 +426,7 @@ export CC=%{_bindir}/gcc %ifarch %{ghc_unregisterized_arches} --enable-unregisterised \ %endif - %{?with_dwarf_unwind:--enable-dwarf-unwind} \ + %{?with_dwarf:--enable-dwarf-unwind} \ %{nil} # avoid "ghc: hGetContents: invalid argument (invalid byte sequence)" @@ -686,7 +682,7 @@ make test %changelog * Tue Mar 10 2020 Jens Petersen -- add bcond for dwarf-unwind debuginfo +- add bcond for dwarf info * Mon Feb 10 2020 Jens Petersen - 8.6.5-102 - rebuild against ghc-rpm-macros fixed for subpackage prof deps From 0be02c427bea61e091f1072072d15c6e2288ab4d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 9 Apr 2020 18:30:23 +0800 Subject: [PATCH 5/6] fix gen_contents_index also when no docs (#1813548) - cronjob used to switch to /usr/share/doc/ghc/html/libraries - since docs now subpackaged, need to check for no docs - we could also recommend ghc-base-doc --- ghc-gen_contents_index-nodocs.patch | 11 +++++++++++ ghc.spec | 13 ++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 ghc-gen_contents_index-nodocs.patch diff --git a/ghc-gen_contents_index-nodocs.patch b/ghc-gen_contents_index-nodocs.patch new file mode 100644 index 0000000..bb7f9a6 --- /dev/null +++ b/ghc-gen_contents_index-nodocs.patch @@ -0,0 +1,11 @@ +--- ghc-8.6.5/libraries/gen_contents_index~ 2020-02-24 15:02:26.318866694 +0800 ++++ ghc-8.6.5/libraries/gen_contents_index 2020-04-09 18:18:40.290722327 +0800 +@@ -47,6 +47,8 @@ + HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG" + done + else ++ if ! ls */*.haddock &>/dev/null; then exit 0; fi ++ + HADDOCK=/usr/bin/haddock + # We don't want the GHC API to swamp the index + HADDOCK_FILES=`ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort` diff --git a/ghc.spec b/ghc.spec index 91e49f1..c47e015 100644 --- a/ghc.spec +++ b/ghc.spec @@ -49,7 +49,7 @@ Version: 8.6.5 # - 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: 102%{?dist} +Release: 103%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -64,6 +64,7 @@ Source7: runghc.man # absolute haddock path (was for html/libraries -> libraries) Patch1: ghc-gen_contents_index-haddock-path.patch 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 @@ -232,6 +233,7 @@ License: BSD Obsoletes: ghc-doc-cron < %{version}-%{release} Requires: ghc-compiler = %{version}-%{release} BuildArch: noarch +#Recommends: ghc-base-doc = %{base_ver}-%{release} %description doc-index The package enables re-indexing of installed library documention. @@ -322,6 +324,7 @@ packages to be automatically installed too. %setup -q -n %{name}-%{version} %{?with_testsuite:-b1} %patch1 -p1 -b .orig +%patch3 -p1 -b .orig %patch2 -p1 -b .orig %patch6 -p1 -b .orig @@ -574,11 +577,11 @@ make test %if %{with haddock} %transfiletriggerin doc-index -- %{ghc_html_libraries_dir} -%{ghc_html_libraries_dir}/gen_contents_index +env -C %{ghc_html_libraries_dir} ./gen_contents_index %end %transfiletriggerpostun doc-index -- %{ghc_html_libraries_dir} -%{ghc_html_libraries_dir}/gen_contents_index +env -C %{ghc_html_libraries_dir} ./gen_contents_index %end %endif @@ -681,8 +684,8 @@ make test %changelog -* Tue Mar 10 2020 Jens Petersen -- add bcond for dwarf info +* Thu Apr 9 2020 Jens Petersen - 8.6.5-103 +- fix running of gen_contents_index when no haddocks (#1813548) * Mon Feb 10 2020 Jens Petersen - 8.6.5-102 - rebuild against ghc-rpm-macros fixed for subpackage prof deps From 8abb3a79a16d994d242d88f3a2da2731ed25e1aa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 9 Apr 2020 19:21:28 +0800 Subject: [PATCH 6/6] drop "recommends: ghc-base-doc" comment warning: Macro expanded in comment on line 236: %{base_ver}-%{release} --- ghc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc.spec b/ghc.spec index c47e015..b02cc00 100644 --- a/ghc.spec +++ b/ghc.spec @@ -233,7 +233,6 @@ License: BSD Obsoletes: ghc-doc-cron < %{version}-%{release} Requires: ghc-compiler = %{version}-%{release} BuildArch: noarch -#Recommends: ghc-base-doc = %{base_ver}-%{release} %description doc-index The package enables re-indexing of installed library documention.