From 31532ee2f5673276d4fbe143ad5fe1477dc1dfe3 Mon Sep 17 00:00:00 2001 From: Alexey Lyubimov Date: Fri, 18 Aug 2023 22:29:52 +0300 Subject: [PATCH] import ghc-8.10.7-116.el9 --- .ghc.metadata | 3 +- .gitignore | 3 +- SOURCES/Disable-unboxed-arrays.patch | 10 + SOURCES/buildpath-abi-stability.patch | 25 + SOURCES/ghc-8.6.3-sphinx-1.8.patch | 35 + SOURCES/ghc-Cabal-install-PATH-warning.patch | 20 +- SOURCES/ghc-gen_contents_index-nodocs.patch | 11 + SOURCES/ghc-pkg.man | 228 +++++ SOURCES/ghc-warnings.mk-CC-Wall.patch | 12 + SOURCES/haddock.man | 231 +++++ SOURCES/no-missing-haddock-file-warning.patch | 22 + SOURCES/runghc.man | 45 + SPECS/ghc.spec | 805 ++++++++++-------- 13 files changed, 1057 insertions(+), 393 deletions(-) create mode 100644 SOURCES/Disable-unboxed-arrays.patch create mode 100644 SOURCES/buildpath-abi-stability.patch create mode 100644 SOURCES/ghc-8.6.3-sphinx-1.8.patch create mode 100644 SOURCES/ghc-gen_contents_index-nodocs.patch create mode 100644 SOURCES/ghc-pkg.man create mode 100644 SOURCES/ghc-warnings.mk-CC-Wall.patch create mode 100644 SOURCES/haddock.man create mode 100644 SOURCES/no-missing-haddock-file-warning.patch create mode 100644 SOURCES/runghc.man diff --git a/.ghc.metadata b/.ghc.metadata index 9fa9422..4a8190d 100644 --- a/.ghc.metadata +++ b/.ghc.metadata @@ -1,2 +1 @@ -a33222646c440826af744ad70447446fb82b74cf SOURCES/ghc-8.2.2-src.tar.xz -ce801cf456b8dacd565ce8df8288b4d90e7317ff SOURCES/llvm-3.9.1.src.tar.xz +08a5b0927d5fd345917b3432cd885ec61eb56af3 SOURCES/ghc-8.10.7-src.tar.xz diff --git a/.gitignore b/.gitignore index 1b3318b..e35184e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/ghc-8.2.2-src.tar.xz -SOURCES/llvm-3.9.1.src.tar.xz +SOURCES/ghc-8.10.7-src.tar.xz diff --git a/SOURCES/Disable-unboxed-arrays.patch b/SOURCES/Disable-unboxed-arrays.patch new file mode 100644 index 0000000..4ccb16d --- /dev/null +++ b/SOURCES/Disable-unboxed-arrays.patch @@ -0,0 +1,10 @@ +--- ghc-8.8.0.20190721/libraries/containers/containers/include/containers.h~ 2019-06-26 20:39:26.000000000 +0000 ++++ ghc-8.8.0.20190721/libraries/containers/containers/include/containers.h 2019-07-27 08:55:10.747060247 +0000 +@@ -35,7 +35,6 @@ + + #ifdef __GLASGOW_HASKELL__ + # define USE_ST_MONAD 1 +-# define USE_UNBOXED_ARRAYS 1 + #endif + + #endif diff --git a/SOURCES/buildpath-abi-stability.patch b/SOURCES/buildpath-abi-stability.patch new file mode 100644 index 0000000..7eeee00 --- /dev/null +++ b/SOURCES/buildpath-abi-stability.patch @@ -0,0 +1,25 @@ +Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424 + +Index: ghc-8.10.1/compiler/iface/MkIface.hs +=================================================================== +--- ghc-8.10.1.orig/compiler/iface/MkIface.hs ++++ ghc-8.10.1/compiler/iface/MkIface.hs +@@ -679,7 +679,7 @@ + iface_hash <- computeFingerprint putNameLiterally + (mod_hash, + ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache +- mi_usages iface0, ++ usages, + sorted_deps, + mi_hpc iface0) + +@@ -714,6 +714,9 @@ + (non_orph_rules, orph_rules) = mkOrphMap ifRuleOrph (mi_rules iface0) + (non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0) + ann_fn = mkIfaceAnnCache (mi_anns iface0) ++ -- Do not allow filenames to affect the interface ++ usages = [ case u of UsageFile _ fp -> UsageFile "" fp; _ -> u | u <- mi_usages iface0 ] ++ + + -- | Retrieve the orphan hashes 'mi_orphan_hash' for a list of modules + -- (in particular, the orphan modules which are transitively imported by the diff --git a/SOURCES/ghc-8.6.3-sphinx-1.8.patch b/SOURCES/ghc-8.6.3-sphinx-1.8.patch new file mode 100644 index 0000000..2f94fc0 --- /dev/null +++ b/SOURCES/ghc-8.6.3-sphinx-1.8.patch @@ -0,0 +1,35 @@ +--- ghc-8.6.3/docs/users_guide/flags.py~ 2018-09-21 06:18:23.000000000 +0800 ++++ ghc-8.6.3/docs/users_guide/flags.py 2019-03-05 10:20:38.639782096 +0800 +@@ -49,6 +49,8 @@ + import sphinx + from sphinx import addnodes + from sphinx.domains.std import GenericObject ++from sphinx.domains import ObjType ++from sphinx.roles import XRefRole + from sphinx.errors import SphinxError + from distutils.version import LooseVersion + from utils import build_table_from_list +@@ -603,14 +605,21 @@ + sphinx_version = LooseVersion(sphinx.__version__) + override_arg = {'override': True} if sphinx_version >= LooseVersion('1.8') else {} + ++ # Yuck: We can't use app.add_object_type since we need to provide the ++ # Directive instance ourselves. ++ std_object_types = app.registry.domain_object_types.setdefault('std', {}) ++ + # Add ghc-flag directive, and override the class with our own +- app.add_object_type('ghc-flag', 'ghc-flag') + app.add_directive_to_domain('std', 'ghc-flag', Flag, **override_arg) ++ app.add_role_to_domain('std', 'ghc-flag', XRefRole()) ++ std_object_types['ghc-flag'] = ObjType('ghc-flag', 'ghc-flag') + + # Add extension directive, and override the class with our own +- app.add_object_type('extension', 'extension') + app.add_directive_to_domain('std', 'extension', LanguageExtension, + **override_arg) ++ app.add_role_to_domain('std', 'extension', XRefRole()) ++ std_object_types['extension'] = ObjType('ghc-flag', 'ghc-flag') ++ + # NB: language-extension would be misinterpreted by sphinx, and produce + # lang="extensions" XML attributes + diff --git a/SOURCES/ghc-Cabal-install-PATH-warning.patch b/SOURCES/ghc-Cabal-install-PATH-warning.patch index 5081fa1..786c5d9 100644 --- a/SOURCES/ghc-Cabal-install-PATH-warning.patch +++ b/SOURCES/ghc-Cabal-install-PATH-warning.patch @@ -1,20 +1,12 @@ ---- ghc-8.2.2/libraries/Cabal/Cabal/Distribution/Simple/Install.hs~ 2017-05-05 16:51:43.000000000 +0200 -+++ ghc-8.2.2/libraries/Cabal/Cabal/Distribution/Simple/Install.hs 2018-01-23 23:05:47.047081056 +0100 -@@ -36,7 +36,7 @@ - import Distribution.Simple.Utils - ( createDirectoryIfMissingVerbose - , installDirectoryContents, installOrdinaryFile, isInSearchPath -- , die', info, noticeNoWrap, warn, matchDirFileGlob ) -+ , die', info, noticeNoWrap, warn, matchDirFileGlob, debug ) - import Distribution.Simple.Compiler - ( CompilerFlavor(..), compilerFlavor ) - import Distribution.Simple.Setup -@@ -215,7 +215,7 @@ +--- ghc-8.2.2/libraries/Cabal/Cabal/Distribution/Simple/Install.hs~ 2017-05-05 23:51:43.000000000 +0900 ++++ ghc-8.2.2/libraries/Cabal/Cabal/Distribution/Simple/Install.hs 2018-02-27 12:22:13.159432104 +0900 +@@ -215,8 +215,7 @@ ++ " in " ++ binPref) inPath <- isInSearchPath binPref when (not inPath) $ - warn verbosity ("The directory " ++ binPref -+ debug verbosity ("The directory " ++ binPref - ++ " is not in the system search path.") +- ++ " is not in the system search path.") ++ warn verbosity ("Executable installed in " ++ binPref) case compilerFlavor (compiler lbi) of GHC -> GHC.installExe verbosity lbi binPref buildPref progFix pkg_descr exe + GHCJS -> GHCJS.installExe verbosity lbi binPref buildPref progFix pkg_descr exe diff --git a/SOURCES/ghc-gen_contents_index-nodocs.patch b/SOURCES/ghc-gen_contents_index-nodocs.patch new file mode 100644 index 0000000..bb7f9a6 --- /dev/null +++ b/SOURCES/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/SOURCES/ghc-pkg.man b/SOURCES/ghc-pkg.man new file mode 100644 index 0000000..ccac8e4 --- /dev/null +++ b/SOURCES/ghc-pkg.man @@ -0,0 +1,228 @@ +.TH ghc-pkg 1 "2010-01-27" +.SH NAME +ghc-pkg \- GHC Haskell Cabal package manager +.SH SYNOPSIS +.B ghc-pkg +.I action +.RI [ OPTION ]... +.SH DESCRIPTION +A package is a library of Haskell modules known to the compiler. The +.B ghc-pkg +tool allows adding or removing them from a package database. By +default, the system-wide package database is modified, but +alternatively the user's local package database or another specified +file can be used. +.PP +To make a package available for +.BR ghc , +.B ghc-pkg +can be used to register it. Unregistering it removes it from the +database. Also, packages can be hidden, to make +.B ghc +ignore the package by default, without uninstalling it. Exposing a +package makes a hidden package available. Additionally, +.B ghc-pkg +has various commands to query the package database. +.PP +Where a package name is required, the package can be named in full +including the version number (e.g. +.BR network-1.0 ), +or without the version number. Naming a package without the version +number matches all versions of the package; the specified action will +be applied to all the matching packages. A package specifier that +matches all version of the package can also be written +.BR pkg-* , +to make it clearer that multiple packages are being matched. +.SH ACTIONS +.TP +\fBregister\fP \fIfilename\fP|\fB-\fP +Register the package using the specified installed package +description. +.TP +\fBupdate\fP \fIfilename\fP|\fB-\fP +Register the package, overwriting any other package with the same +name. +.TP +\fBunregister\fP \fIpkg-id\fP +Unregister the specified package. +.TP +\fBexpose\fP \fIpkg-id\fP +Expose the specified package. +.TP +\fBhide\fP \fIpkg-id\fP +Hide the specified package +.TP +\fBlist\fP \fR[\fIpkg\fR]...\fP +List registered packages in the global database, and also the user +database if +.B --user +is given. If a package name is given all the registered versions will +be listed in ascending order. Accepts the +.B --simple-output +flag. +.TP +.B dot +Generate a graph of the package dependencies in a form suitable for +input for the graphviz tools. For example, to generate a PDF of the +dependency graph: +.br +\fB dot \| tred \| dot -Tpdf >pkgs.pdf\fP +.TP +\fBfind-module\fP \fImodule\fP +List registered packages exposing module +.I module +in the global database, and also the user database if +.B --user +is given. All the registered versions will be listed in ascending +order. Accepts the +.B --simple-output +flag. +.TP +\fBlatest\fP \fIpkg-id\fP +Prints the highest registered version of a package. +.TP +.B check +Check the consistency of package dependencies and list broken +packages. Accepts the +.B --simple-output +flag. +.TP +\fBdescribe\fP \fIpkg\fP +Give the registered description for the +specified package. The description is returned in precisely the syntax +required by ghc-pkg register. +.TP +\fBfield\fP \fIpkg field\fP +Extract the specified field of the package description for the +specified package. Accepts comma-separated multiple fields. +.TP +.B dump +Dump the registered description for every package. This is like +.BR ghc-pkg\ describe\ '*' , +expect that it is intended to be used by tools that parse the results, +rather than humans. +.TP +.B recache +Regenerate the package database cache. This command should only be +necessary if you added a package to the database by dropping a file +into the database directory manyally. By default, the global DB is +recached; to recache a different DB use +.B --user +or +.B --package-conf +as appropriate. +.SH OPTIONS +When asked to modify a database +.RB ( register ,\ unregister ,\ update ,\ hide ,\ expose ,\ and\ also\ check ), +.B ghc-pkg +modifies the global database by +default. Specifying +.B --user +causes it to act on the user database, +or +.B --package-conf +can be used to act on another database +entirely. When multiple of these options are given, the rightmost +one is used as the database to act upon. +.PP +Commands that query the package database +.RB ( list ,\ latest ,\ describe ,\ field ) +operate on the list of databases specified by the flags +.BR --user ,\ --global , +and +.BR --package-conf . +If none of these flags are +given, the default is +.BR --global\ --user . +.TP +.B --user +Use the current user's package database. +.TP +.B --global +Use the global package database. +.TP +\fB-f\fP \fIFILE\fP, \fB--package-conf=\fIFILE\fP +Use the specified package config file. +.TP +.BI --global-conf= FILE +Location of the global package config. +.TP +.B --force +Ignore missing dependencies, directories, and libraries. +.TP +.B --force-files +Ignore missing directories and libraries only. +.TP +.BR -g ,\ --auto-ghc-libs +Automatically build libs for GHCi (with register). +.TP +.BR -? ,\ --help +Display a help message and exit. +.TP +.BR -V ,\ --version +Output version information and exit. +.TP +.B --simple-output +Print output in easy-to-parse format for some commands. +.TP +.B --names-only +Only print package names, not versions; can only be used with +.BR list\ --simple-output . +.TP +.B --ignore-case +Ignore case for substring matching. +.SH ENVIRONMENT VARIABLES +.TP +.B GHC_PACKAGE_PATH +The +.B GHC_PACKAGE_PATH +environment variable may be set to a +.BR : -separated +list of files containing package databases. This list of package +databases is used by +.B ghc +and +.BR ghc-pkg , +with earlier databases in the list overriding later ones. This order +was chosen to match the behaviour of the +.B PATH +environment variable; think of it as a list of package databases that +are searched left-to-right for packages. + +If +.B GHC_PACKAGE_PATH +ends in a separator, then the default user and system package +databases are appended, in that order. e.g. to augment the usual set +of packages with a database of your own, you could say: + +.br +\fB export GHC_PACKAGE_PATH=$HOME/.my-ghc-packages.conf:\fP +.br + +To check whether your +.B GHC_PACKAGE_PATH +setting is doing the right thing, +.B ghc-pkg list +will list all the databases in use, in the reverse order they are +searched. +.SH FILES +Both of these locations are changed for Debian. Upstream still keeps +these under +.IR /usr . +Some programs may refer to that, but look in +.I /var +instead. +.TP +.I /var/lib/ghc/package.conf +Global package.conf file. +.TP +.I /var/lib/ghc/package.conf.d/ +Directory for library specific package.conf files. These are added to +the global registry. +.SH "SEE ALSO" +.BR ghc (1), +.BR runghc (1), +.BR hugs (1). +.SH AUTHOR +This manual page was written by Kari Pahula , for the +Debian project (and may be used by others). diff --git a/SOURCES/ghc-warnings.mk-CC-Wall.patch b/SOURCES/ghc-warnings.mk-CC-Wall.patch new file mode 100644 index 0000000..f775eb3 --- /dev/null +++ b/SOURCES/ghc-warnings.mk-CC-Wall.patch @@ -0,0 +1,12 @@ +--- ghc-8.4.3/mk/warnings.mk~ 2018-02-04 02:30:11.000000000 +0900 ++++ ghc-8.4.3/mk/warnings.mk 2018-09-29 14:33:37.607884921 +0900 +@@ -1,6 +1,6 @@ + # See Note [Order of warning flags]. +-SRC_CC_OPTS += -Wall $(WERROR) ++#SRC_CC_OPTS += -Wall $(WERROR) + SRC_HC_OPTS += -Wall + # Don't add -Werror to SRC_HC_OPTS_STAGE0 (or SRC_HC_OPTS), because otherwise + # validate may unnecessarily fail when booting with an older compiler. + # It would be better to only exclude certain warnings from becoming errors + +Diff finished. Sat Sep 29 14:35:43 2018 diff --git a/SOURCES/haddock.man b/SOURCES/haddock.man new file mode 100644 index 0000000..a30106b --- /dev/null +++ b/SOURCES/haddock.man @@ -0,0 +1,231 @@ +.TH HADDOCK 1 "July 2010" "Haddock, version 2.6.1" "Haddock documentation generator" + + +.SH NAME +haddock \- documentation tool for annotated Haskell source code + + +.SH SYNOPSIS +.B haddock +.RI [ options ] " file" ... + + +.SH DESCRIPTION +This manual page documents briefly the +.B haddock +command. +Extensive documentation is available in various other formats including DVI, +PostScript and HTML; see below. + +.PP +.I file +is a filename containing a Haskell source module. +All the modules specified on the command line will be processed together. +When one module refers to an entity in another module being processed, the +documentation will link directly to that entity. + +Entities that cannot be found, for example because they are in a module that +is not being processed as part of the current batch, simply will not be +hyperlinked in the generated documentation. +.B haddock +will emit warnings listing all the identifiers it could not resolve. + +The modules should not be mutually recursive, as +.B haddock +does not like swimming in circles. + + +.SH OPTIONS +The programs follow the usual GNU command line syntax, with long +options starting with two dashes (`--'). +A summary of options is included below. +For a complete description, see the other documentation. + +.TP +\fB\-o \fIDIR\fP, \-\-odir=\fIDIR\fP +directory in which to put the output files + +.TP +\fB\-i \fIFILE\fP, \-\-read-interface=\fIFILE\fP +read an interface from +.IR FILE . + +.TP +\fB\-D \fIFILE\fP, \-\-dump\-interface=\fIFILE\fP +dump an interface for these modules in +.IR FILE . + +.TP +\fB\-l \fIDIR\fP, \-\-lib=\fIDIR\fP +location of Haddock's auxiliary files + +.TP +.BR \-h ", " \-\-html +Generate documentation in HTML format. +Several files will be generated into the current directory (or the specified +directory if the +.B \-o +option is given), including the following: +.RS +.TP +.I index.html +The top level page of the documentation: +lists the modules available, using indentation to represent the hierarchy if +the modules are hierarchical. +.TP +.I haddock.css +The stylesheet used by the generated HTML. +Feel free to modify this to change the colors or layout, or even specify +your own stylesheet using the +.B \-\-css +option. +.TP +.I module.html +An HTML page for each module. +.TP +.IR doc-index.html ", " doc-index-XX.html +The index, split into two (functions/constructors and types/classes, as per +Haskell namespaces) and further split alphabetically. +.RE + +.TP +.B \-\-hoogle +output for Hoogle + +.TP +\fB\-\-html\-help=\fIformat +produce index and table of contents in mshelp, mshelp2 or devhelp format +(with \fI\-h\fP) + +.TP +\fB\-\-source\-base=\fPURL +Include links to the source files in the generated documentation, where URL +is the base URL where the source files can be found. + +.TP +\fB\-s \fPURL, \fB\-\-source\-module=\fPURL +Include links to the source files in the generated documentation, where URL +is a source code link for each module (using the %{FILE} or %{MODULE} vars). + +.TP +\fB\-\-source\-entity=\fPURL +Include links to the source files in the generated documentation, where URL +is a source code link for each entity (using the %{FILE}, %{MODULE} or %{NAME} vars). + +.TP +\fB\-\-comments\-base=\fPURL +URL for a comments link on the contents and index pages. +.TP +\fB\-\-comments\-module=\fPURL +URL for a comments link for each module (using the %{MODULE} var). +.TP +\fB\-\-comments\-entity=\fPURL +URL for a comments link for each entity (using the %{FILE}, %{MODULE} or %{NAME} vars). +.TP +.BI \-\-css= FILE +Use the CSS +.I FILE +instead of the default stylesheet that comes with +.B haddock +for HTML output. It should specify certain classes: see the default stylesheet for details. + +.TP +\fB\-p \fIFILE\fP, \-\-prologue=\fIFILE\fP +Specify a file containing prologue text. + +.TP +\fB\-t \fITITLE\fP, \-\-title=\fITITLE\fP +Use \fITITLE\fP as the page heading for each page in the documentation. +This will normally be the name of the library being documented. + +The title should be a plain string (no markup please!). + +.TP +\fB\-k \fINAME\fP, \-\-package=\fINAME\fP +Specify the package name (optional). + +.TP +.BR \-n ", " \-\-no\-implicit\-prelude +do not assume Prelude is imported + +.TP +.BR \-d ", " \-\-debug +Enable extra debugging output. + +.TP +.BR \-? ", " \-\-help +Display help. + +.TP +.BR \-V ", " \-\-version +Display version. + +.TP +.BR \-v ", " \-\-verbose +Verbose status reporting. + +.TP +\fB\-\-use\-contents=\fPURL +Use a separately-generated HTML contents page. + +.TP +.B \-\-gen\-contents +Generate an HTML contents from specified interfaces. + +.TP +\fB\-\-use\-index=\fPURL +Use a separately-generated HTML index. + +.TP +.B \-\-gen\-index +Generate an HTML index from specified interfaces. + +.TP +.B \-\-ignore\-all\-exports +Behave as if all modules have the ignore-exports atribute + +.TP +\fB\-\-hide=\fIMODULE +Behave as if \fIMODULE\fP has the hide attribute. + +.TP +\fB\-\-use\-package=\fIPACKAGE +The modules being processed depend on \fIPACKAGE\fP. + +.SH FILES +.I /usr/bin/haddock +.br +.I /usr/share/haddock-2.6.1/html/plus.gif +.br +.I /usr/share/haddock-2.6.1/html/minus.gif +.br +.I /usr/share/haddock-2.6.1/html/haskell_icon.gif +.br +.I /usr/share/haddock-2.6.1/html/haddock.js +.br +.I /usr/share/haddock-2.6.1/html/haddock.css +.br +.I /usr/share/haddock-2.6.1/html/haddock-DEBUG.css + +.SH SEE ALSO +.IR /usr/share/doc/haddock/ , +.br +the Haddock homepage +.UR http://haskell.org/haddock/ +(http://haskell.org/haddock/) +.UE + +.SH COPYRIGHT +Haddock version 2.6.1 + +Copyright 2006-2010 Simon Marlow , Dawid Waern . +All rights reserved. + + +.SH AUTHOR +This manual page was written by Michael Weber +for the Debian GNU/Linux system (but may be used by others). + +.\" Local variables: +.\" mode: nroff +.\" End: diff --git a/SOURCES/no-missing-haddock-file-warning.patch b/SOURCES/no-missing-haddock-file-warning.patch new file mode 100644 index 0000000..eac921e --- /dev/null +++ b/SOURCES/no-missing-haddock-file-warning.patch @@ -0,0 +1,22 @@ +Description: Do not emit a warning if the .haddock file is missing + As it is quite common on Debian installations to install the -dev package + without the -doc package. +Author: Joachim Breitner + +Index: ghc-8.0.2/utils/ghc-pkg/Main.hs +=================================================================== +--- ghc-8.0.2.orig/utils/ghc-pkg/Main.hs ++++ ghc-8.0.2/utils/ghc-pkg/Main.hs +@@ -1588,8 +1588,10 @@ + mapM_ (checkDir True "dynamic-library-dirs") (libraryDynDirs pkg) + mapM_ (checkDir True "include-dirs") (includeDirs pkg) + mapM_ (checkDir True "framework-dirs") (frameworkDirs pkg) +- mapM_ (checkFile True "haddock-interfaces") (haddockInterfaces pkg) +- mapM_ (checkDirURL True "haddock-html") (haddockHTMLs pkg) ++ -- In Debian, it is quite normal that the package is installed without the ++ -- documentation. Do not print a warning there. ++ -- mapM_ (checkFile True "haddock-interfaces") (haddockInterfaces pkg) ++ -- mapM_ (checkDirURL True "haddock-html") (haddockHTMLs pkg) + checkDuplicateModules pkg + checkExposedModules db_stack pkg + checkOtherModules pkg diff --git a/SOURCES/runghc.man b/SOURCES/runghc.man new file mode 100644 index 0000000..61a9076 --- /dev/null +++ b/SOURCES/runghc.man @@ -0,0 +1,45 @@ +.TH RUNGHC 1 "28 NOVEMBER 2007" +.SH NAME +runghc \- program to run Haskell programs without first having to compile them. +.SH SYNOPSIS +.B runghc +.RI +[runghc|flags] [GHC|flags] module [program|flags]... +.br +.SH DESCRIPTION +.B runghc +is considered a non-interactive interpreter and part of The Glasgow Haskell Compiler. +.B runghc +is a compiler that automatically runs its results at the end. +.PP +.SH OPTIONS +.TP +the flags are: +.TP +.B \-f +it tells runghc which GHC to use to run the program. If it is not given then runghc will search for GHC in the directories in the system search path. runghc -f /path/to/ghc +.TP +.B \-- +runghc will try to work out where the boundaries between [runghc flags] and [GHC flags], and [GHC flags] and module are, but you can use a -- flag if it doesn't get it right. For example, runghc -- -fglasgow-exts Foo +means runghc won't try to use glasgow-exts as the path to GHC, but instead will pass the flag to GHC. + +.SH EXAMPLES +.TP +.B runghc foo +.PP +.B runghc -f /path/to/ghc foo +.TP +.B runghc -- -fglasgow-exts Foo + +.SH SEE ALSO +.BR ghc (1), +.BR ghci (1). +.br + +.SH COPYRIGHT +Copyright 2002, The University Court of the University of Glasgow. All rights reserved. + +.SH AUTHOR +This manual page was written by Efrain Valles Pulgar . This is free documentation; see the GNU +General Public Licence version 2 or later for copying conditions. There is NO WARRANTY. + diff --git a/SPECS/ghc.spec b/SPECS/ghc.spec index b5d00f0..6245b01 100644 --- a/SPECS/ghc.spec +++ b/SPECS/ghc.spec @@ -1,125 +1,143 @@ -# perf production build (disable for quick build) -%bcond_without perf_build +# disable prof, docs, perf build, debuginfo +# NB This must be disabled (bcond_with) for all koji production builds +%bcond_with quickbuild + +# make sure ghc libraries' ABI hashes unchanged +%bcond_without abicheck # to handle RCs %global ghc_release %{version} -# make sure ghc libraries' ABI hashes unchanged -%bcond_without abicheck +%global base_ver 4.14.3.0 -# run testsuite -%bcond_with testsuite # build profiling libraries -%bcond_without prof -# build docs (haddock and manuals) -# combined since disabling haddock seems to cause no manuals built -# -%bcond_without docs - -# 8.2 needs llvm-3.9 -%global llvm_major 3.9 -%global llvm_version %{llvm_major}.1 +# build haddock +# perf production build (disable for quick build) +%if %{with quickbuild} +%undefine with_ghc_prof +%undefine with_haddock +%bcond_with perf_build +%undefine _enable_debug_packages +%else +%bcond_without ghc_prof +%bcond_without haddock +%bcond_without perf_build +%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 +%{?with_haddock:%bcond_without manual} + +# no longer build testsuite (takes time and not really being used) +%bcond_with testsuite + +# 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 -# ghc must be rebuilt after a version bump to avoid ABI change problems -Version: 8.2.2 +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: 68.3%{?dist} +Release: 116%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport URL: https://haskell.org/ghc/ -Source0: https://downloads.haskell.org/~ghc/%{ghc_release}/ghc-%{version}-src.tar.xz +Source0: https://downloads.haskell.org/ghc/%{ghc_release}/ghc-%{version}-src.tar.xz %if %{with testsuite} -Source1: https://downloads.haskell.org/~ghc/%{ghc_release}/ghc-%{version}-testsuite.tar.xz +Source1: https://downloads.haskell.org/ghc/%{ghc_release}/ghc-%{version}-testsuite.tar.xz %endif -Source3: ghc-doc-index.cron -Source4: ghc-doc-index - -Source10: http://llvm.org/releases/%{llvm_version}/llvm-%{llvm_version}.src.tar.xz - +Source5: ghc-pkg.man +Source6: haddock.man +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 -# https://github.com/haskell/cabal/issues/4728 -# https://ghc.haskell.org/trac/ghc/ticket/14381 -# https://phabricator.haskell.org/D4159 -Patch4: D4159.patch -# https://github.com/ghc/ghc/pull/143 -Patch5: ghc-configure-fix-sphinx-version-check.patch - +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 + +# Arch dependent patches +# arm Patch12: ghc-armv7-VFPv3D16--NEON.patch -# Debian patches: -# doesn't apply to 8.2 -#Patch24: ghc-Debian-buildpath-abi-stability.patch -Patch26: ghc-Debian-no-missing-haddock-file-warning.patch -Patch27: ghc-Debian-reproducible-tmp-names.patch -Patch28: ghc-Debian-x32-use-native-x86_64-insn.patch +# for unregisterized +# https://ghc.haskell.org/trac/ghc/ticket/15689 +Patch15: ghc-warnings.mk-CC-Wall.patch -# llvm3.9 patches + 100 -Patch106: llvm-install_dirs.patch -Patch174: llvm-D25865-cmakeshlib.patch +# bigendian (s390x and ppc64) +# https://gitlab.haskell.org/ghc/ghc/issues/15411 +# https://gitlab.haskell.org/ghc/ghc/issues/16505 +# https://bugzilla.redhat.com/show_bug.cgi?id=1651448 +# https://ghc.haskell.org/trac/ghc/ticket/15914 +# https://gitlab.haskell.org/ghc/ghc/issues/16973 +# https://bugzilla.redhat.com/show_bug.cgi?id=1733030 +Patch18: Disable-unboxed-arrays.patch + +# Debian patches: +Patch24: buildpath-abi-stability.patch +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 +BuildRequires: ghc-compiler > 8.6 # for ABI hash checking %if %{with abicheck} BuildRequires: ghc %endif -BuildRequires: ghc-rpm-macros-extra >= 1.8 +BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel 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 +BuildRequires: hscolour BuildRequires: libffi-devel +BuildRequires: make # for terminfo BuildRequires: ncurses-devel -# for man and docs BuildRequires: perl-interpreter -BuildRequires: %{_bindir}/python3 -%if %{with docs} -# python2-sphinx needs python2-babel +%if %{with testsuite} +BuildRequires: python3 +%endif +%if %{with manual} BuildRequires: python3-sphinx %endif -# patch5 -BuildRequires: autoconf +%ifarch %{ghc_llvm_archs} +BuildRequires: llvm%{llvm_major} +%endif %ifarch armv7hl # patch12 BuildRequires: autoconf, automake %endif - -# llvm -%ifarch %{ghc_llvm_archs} -BuildRequires: cmake3 -BuildRequires: zlib-devel -BuildRequires: libedit-devel -BuildRequires: libffi-devel -BuildRequires: ncurses-devel -#BuildRequires: python-sphinx -BuildRequires: valgrind-devel -BuildRequires: libstdc++-static -%endif - Requires: ghc-compiler = %{version}-%{release} -%if %{with docs} -Requires: ghc-doc-cron = %{version}-%{release} -%endif +Requires: ghc-devel = %{version}-%{release} Requires: ghc-ghc-devel = %{version}-%{release} -Requires: ghc-libraries = %{version}-%{release} -%if %{with docs} -Requires: ghc-manual = %{version}-%{release} +%if %{with haddock} +Suggests: ghc-doc = %{version}-%{release} +Suggests: ghc-doc-index = %{version}-%{release} +%endif +%if %{with manual} +Suggests: ghc-manual = %{version}-%{release} +%endif +%if %{with ghc_prof} +Suggests: ghc-prof = %{version}-%{release} %endif %description @@ -149,43 +167,47 @@ for the functional language Haskell. Highlights: Summary: GHC compiler and utilities License: BSD Requires: gcc%{?_isa} -Requires: ghc-base-devel%{?_isa} -# for alternatives -Requires(post): chkconfig -Requires(postun): chkconfig -# added in f14 -Obsoletes: ghc-doc < 6.12.3-4 -%if %{without docs} -Obsoletes: ghc-doc-cron < %{version}-%{release} -# added in f28 +Requires: ghc-base-devel%{?_isa} = %{base_ver}-%{release} +Requires: ghc-filesystem +%if %{without haddock} +# added during f31 Obsoletes: ghc-doc-index < %{version}-%{release} %endif +%ifarch %{ghc_llvm_archs} +Requires: llvm%{llvm_major} +%endif %description compiler The package contains the GHC compiler, tools and utilities. -The ghc libraries are provided by ghc-libraries. +The ghc libraries are provided by ghc-devel. To install all of ghc (including the ghc library), install the main ghc package. -%if %{with docs} -%package doc-cron -Summary: GHC library documentation indexing cronjob +%if %{with haddock} +%package doc +Summary: Haskell library documentation meta package License: BSD + +%description doc +Installing this package causes ghc-*-doc packages corresponding to ghc-*-devel +packages to be automatically installed too. + + +%package doc-index +Summary: GHC library documentation indexing +License: BSD +Obsoletes: ghc-doc-cron < %{version}-%{release} Requires: ghc-compiler = %{version}-%{release} -Requires: crontabs -# added in f28 -Obsoletes: ghc-doc-index < %{version}-%{release} BuildArch: noarch -%description doc-cron -The package provides a cronjob for re-indexing installed library development -documention. +%description doc-index +The package enables re-indexing of installed library documention. %endif -%if %{with docs} +%if %{with manual} %package manual Summary: GHC manual License: BSD @@ -199,160 +221,113 @@ This package provides the User Guide and Haddock manual. # ghclibdir also needs ghc_version_override for bootstrapping %global ghc_version_override %{version} -# EL7 rpm supports fileattrs ghc.attr -%if 0%{?rhel} && 0%{?rhel} < 7 -# needs ghc_version_override for bootstrapping -%global _use_internal_dependency_generator 0 -%global __find_provides /usr/lib/rpm/rpmdeps --provides -%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir} -%endif - -%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release} - %global BSDHaskellReport %{quote:BSD and HaskellReport} # use "./libraries-versions.sh" to check versions %if %{defined ghclibdir} -%ghc_lib_subpackage -d -l BSD Cabal-2.0.1.0 -%ghc_lib_subpackage -d -l %BSDHaskellReport array-0.5.2.0 -%ghc_lib_subpackage -d -l %BSDHaskellReport -c gmp-devel%{?_isa},libffi-devel%{?_isa} base-4.10.1.0 -%ghc_lib_subpackage -d -l BSD binary-0.8.5.1 -%ghc_lib_subpackage -d -l BSD bytestring-0.10.8.2 -%ghc_lib_subpackage -d -l %BSDHaskellReport containers-0.5.10.2 -%ghc_lib_subpackage -d -l %BSDHaskellReport deepseq-1.4.3.0 -%ghc_lib_subpackage -d -l %BSDHaskellReport directory-1.3.0.2 -%ghc_lib_subpackage -d -l BSD filepath-1.4.1.2 -%define ghc_pkg_obsoletes ghc-bin-package-db-devel < 0.0.0.0-12 +%ghc_lib_subpackage -d -l BSD Cabal-3.2.1.0 +%ghc_lib_subpackage -d -l %BSDHaskellReport array-0.5.4.0 +%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.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 +%ghc_lib_subpackage -d -l BSD filepath-1.4.2.1 # in ghc not ghc-libraries: %ghc_lib_subpackage -d -x ghc-%{ghc_version_override} -%undefine ghc_pkg_obsoletes %ghc_lib_subpackage -d -x -l BSD ghc-boot-%{ghc_version_override} %ghc_lib_subpackage -d -l BSD ghc-boot-th-%{ghc_version_override} %ghc_lib_subpackage -d -l BSD ghc-compact-0.1.0.0 +%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.7.4.0 -%ghc_lib_subpackage -d -l BSD hoopl-3.10.2.2 -%ghc_lib_subpackage -d -l BSD hpc-0.6.0.3 -%ghc_lib_subpackage -d -l BSD pretty-1.1.3.3 -%ghc_lib_subpackage -d -l %BSDHaskellReport process-1.6.1.0 -%ghc_lib_subpackage -d -l BSD template-haskell-2.12.0.0 -%ghc_lib_subpackage -d -l BSD -c ncurses-devel%{?_isa} terminfo-0.4.1.0 -%ghc_lib_subpackage -d -l BSD time-1.8.0.2 -%ghc_lib_subpackage -d -l BSD transformers-0.5.2.0 +%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.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 +%ghc_lib_subpackage -d -l BSD text-1.2.4.1 +%ghc_lib_subpackage -d -l BSD time-1.9.3 +%ghc_lib_subpackage -d -l BSD transformers-0.5.6.2 %ghc_lib_subpackage -d -l BSD unix-2.7.2.2 -%if %{with docs} -%ghc_lib_subpackage -d -l BSD xhtml-3000.2.2 +%if %{with haddock} +%ghc_lib_subpackage -d -l BSD xhtml-3000.2.2.1 %endif %endif %global version %{ghc_version_override} -%package libraries +%package devel Summary: GHC development libraries meta package License: BSD and HaskellReport Requires: ghc-compiler = %{version}-%{release} -Obsoletes: ghc-devel < %{version}-%{release} -Provides: ghc-devel = %{version}-%{release} -Obsoletes: ghc-prof < %{version}-%{release} -Provides: ghc-prof = %{version}-%{release} -# since f15 -Obsoletes: ghc-libs < 7.0.1-3 +Obsoletes: ghc-libraries < %{version}-%{release} +Provides: ghc-libraries = %{version}-%{release} %{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")} -%description libraries +%description devel This is a meta-package for all the development library packages in GHC except the ghc library, which is installed by the toplevel ghc metapackage. +%if %{with ghc_prof} +%package prof +Summary: GHC profiling libraries meta package +License: BSD +Requires: ghc-compiler = %{version}-%{release} + +%description prof +Installing this package causes ghc-*-prof packages corresponding to ghc-*-devel +packages to be automatically installed too. +%endif + + %prep -%ifarch %{ghc_llvm_archs} -%setup -q -n %{name}-%{version} %{?with_testsuite:-b1} -a10 -( -cd llvm-%{llvm_version}.src -%patch106 -p1 -b .instdirs -%patch174 -p1 -b .julia4 -) -%else %setup -q -n %{name}-%{version} %{?with_testsuite:-b1} -%endif %patch1 -p1 -b .orig +%patch3 -p1 -b .orig %patch2 -p1 -b .orig -%patch4 -p1 -b .orig -%patch5 -p1 -b .orig +%patch6 -p1 -b .orig -%if 0%{?fedora} || 0%{?rhel} > 6 rm -r libffi-tarballs -%endif %ifarch armv7hl -%patch12 -p1 -b .orig +%patch12 -p1 -b .orig12 %endif -#%%patch24 -p1 -b .orig +# remove s390x after switching to llvm +%ifarch %{ghc_unregisterized_arches} s390x +%patch15 -p1 -b .orig +%endif + +# bigendian +%ifarch ppc64 s390x +%patch18 -p1 -b .orig +%endif + +# debian +%patch24 -p1 -b .orig %patch26 -p1 -b .orig -%patch27 -p1 -b .orig -%patch28 -p1 -b .orig +%if %{with haddock} %global gen_contents_index gen_contents_index.orig -%if %{with docs} if [ ! -f "libraries/%{gen_contents_index}" ]; then echo "Missing libraries/%{gen_contents_index}, needed at end of %%install!" exit 1 fi %endif - -%build -%ifarch %{ghc_llvm_archs} -( -cd llvm-%{llvm_version}.src -mkdir -p _build -cd _build -%cmake3 .. \ - -DBUILD_SHARED_LIBS:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-Bsymbolic -static-libstdc++" \ - -DCMAKE_INSTALL_PREFIX=%{ghclibdir}/llvm \ - -DLLVM_TARGETS_TO_BUILD="X86;AArch64" \ - -DLLVM_ENABLE_LIBCXX:BOOL=OFF \ - -DLLVM_ENABLE_ZLIB:BOOL=ON \ - -DLLVM_ENABLE_FFI:BOOL=ON \ - -DLLVM_ENABLE_RTTI:BOOL=ON \ - \ - -DLLVM_BUILD_RUNTIME:BOOL=ON \ - \ - -DLLVM_INCLUDE_TOOLS:BOOL=ON \ - -DLLVM_BUILD_TOOLS:BOOL=ON \ - \ - -DLLVM_INCLUDE_TESTS:BOOL=OFF \ - -DLLVM_BUILD_TESTS:BOOL=OFF \ - \ - -DLLVM_INCLUDE_EXAMPLES:BOOL=OFF \ - -DLLVM_BUILD_EXAMPLES:BOOL=OFF \ - \ - -DLLVM_INCLUDE_UTILS:BOOL=OFF \ - -DLLVM_INSTALL_UTILS:BOOL=OFF \ - \ - -DLLVM_INCLUDE_DOCS:BOOL=OFF \ - -DLLVM_BUILD_DOCS:BOOL=OFF \ - -DLLVM_ENABLE_SPHINX:BOOL=OFF \ - -DLLVM_ENABLE_DOXYGEN:BOOL=OFF \ - -DSPHINX_OUTPUT_HTML:BOOL=OFF \ - -DSPHINX_WARNINGS_AS_ERRORS:BOOL=OFF \ - \ - -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \ - -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ - -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \ - -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=OFF \ - -make %{?_smp_mflags} -) -%endif - -# http://hackage.haskell.org/trac/ghc/wiki/Platforms -# cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc +# http://ghc.haskell.org/trac/ghc/wiki/Platforms cat > mk/build.mk << EOF %if %{with perf_build} %ifarch %{ghc_llvm_archs} @@ -367,45 +342,32 @@ BuildFlavour = quick-llvm BuildFlavour = quick %endif %endif -GhcLibWays = v dyn %{?with_prof:p} -%if %{with docs} +GhcLibWays = v dyn %{?with_ghc_prof:p} +%if %{with haddock} HADDOCK_DOCS = YES -BUILD_MAN = YES +EXTRA_HADDOCK_OPTS += --hyperlinked-source --hoogle --quickjump %else HADDOCK_DOCS = NO +%endif +%if %{with manual} +BUILD_MAN = YES +BUILD_SPHINX_HTML = YES +%else BUILD_MAN = NO +BUILD_SPHINX_HTML = NO %endif -EXTRA_HADDOCK_OPTS += --hyperlinked-source 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 %ifarch armv7hl autoreconf -%else -# for patch5 -autoconf %endif -%if 0%{?fedora} > 28 || 0%{?rhel} > 7 -%ghc_set_cflags -%else -# -Wunused-label is extremely noisy -%ifarch aarch64 s390x -CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall -Werror=format-security //')}" -%else -CFLAGS="${CFLAGS:-%optflags}" -%endif -export CFLAGS -%endif -export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}" -# for ghc-8.2 +%ghc_set_gcc_flags export CC=%{_bindir}/gcc + # * %%configure induces cross-build due to different target/host/build platform names ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ @@ -413,132 +375,99 @@ export CC=%{_bindir}/gcc --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ --docdir=%{_docdir}/ghc \ -%ifarch %{ghc_llvm_archs} - --with-llc=$PWD/llvm-%{llvm_version}.src/_build/bin/llc --with-opt=$PWD/llvm-%{llvm_version}.src/_build/bin/opt \ -%else - --with-llc=%{_bindir}/llc-%{llvm_major} --with-opt=%{_bindir}/opt-%{llvm_major} \ -%endif -%if 0%{?fedora} || 0%{?rhel} > 6 --with-system-libffi \ +%ifarch %{ghc_unregisterized_arches} + --enable-unregisterised \ %endif %{nil} # avoid "ghc: hGetContents: invalid argument (invalid byte sequence)" -export LANG=en_US.utf8 +export LANG=C.utf8 make %{?_smp_mflags} %install -%ifarch %{ghc_llvm_archs} -( -cd llvm-%{llvm_version}.src -cd _build -make install DESTDIR=%{buildroot} -) -%endif - make DESTDIR=%{buildroot} install %if %{defined _ghcdynlibdir} -mv %{buildroot}%{ghclibdir}/*/libHS*ghc%{ghc_version}.so %{buildroot}%{_libdir}/ -for i in $(find %{buildroot} -path %{buildroot}%{ghclibdir}/llvm -prune -o -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do +mv %{buildroot}%{ghclibdir}/*/libHS*ghc%{ghc_version}.so %{buildroot}%{_ghcdynlibdir}/ +for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do chrpath -d $i done for i in %{buildroot}%{ghclibdir}/package.conf.d/*.conf; do - sed -i -e 's!^dynamic-library-dirs: .*!dynamic-library-dirs: %{_libdir}!' $i + sed -i -e 's!^dynamic-library-dirs: .*!dynamic-library-dirs: %{_ghcdynlibdir}!' $i done +sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_ghcdynlibdir}!' %{buildroot}%{ghclibdir}/package.conf.d/rts.conf %endif +# containers src moved to a subdir +cp -p libraries/containers/containers/LICENSE libraries/containers/LICENSE + +# libraries licenses +rm %{buildroot}%{ghc_html_libraries_dir}/{ghc-prim,integer-gmp}-*/LICENSE +mkdir -p %{buildroot}%{_ghclicensedir} +for i in $(cd %{buildroot}%{ghc_html_libraries_dir}; ls */LICENSE); do + pkg=$(dirname $i | sed -e "s/\\(.*\\)-.*/\\1/") + mkdir %{buildroot}%{_ghclicensedir}/ghc-$pkg + mv %{buildroot}%{ghc_html_libraries_dir}/$i %{buildroot}%{_ghclicensedir}/ghc-$pkg/ +done + for i in %{ghc_packages_list}; do name=$(echo $i | sed -e "s/\(.*\)-.*/\1/") ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/") %ghc_gen_filelists $name $ver -%if 0%{?rhel} && 0%{?rhel} < 8 -echo "%%doc libraries/$name/LICENSE" >> ghc-$name.files -%else -echo "%%license libraries/$name/LICENSE" >> ghc-$name.files -%endif 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.5.1.1 -%ghc_gen_filelists integer-gmp 1.0.1.0 +%ghc_gen_filelists ghc-prim 0.6.1 +%ghc_gen_filelists integer-gmp 1.0.3.0 %define merge_filelist()\ -cat ghc-%1.files >> ghc-%2.files\ -cat ghc-%1-devel.files >> ghc-%2-devel.files\ cp -p libraries/%1/LICENSE libraries/LICENSE.%1\ -%if 0%{?rhel} && 0%{?rhel} < 8\ -echo "%%doc libraries/LICENSE.%1" >> ghc-%2.files\ -%else\ echo "%%license libraries/LICENSE.%1" >> ghc-%2.files\ -%endif +cat ghc-%1.files >> ghc-%2.files\ +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 -%if %{defined _ghcdynlibdir} -echo "%{ghclibdir}/rts" >> ghc-base-devel.files -%else -echo "%%dir %{ghclibdir}/rts" >> ghc-base.files -ls -d %{buildroot}%{ghclibdir}/rts/lib*.a >> ghc-base-devel.files -%endif -ls %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%{ghclibdir}/rts}/libHSrts*.so >> ghc-base.files -%if 0%{?rhel} && 0%{?rhel} < 7 -ls %{buildroot}%{ghclibdir}/rts/libffi.so.* >> ghc-base.files -%endif -%if %{defined _ghcdynlibdir} -sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_libdir}!' %{buildroot}%{ghclibdir}/package.conf.d/rts.conf -%endif - -ls -d %{buildroot}%{ghclibdir}/package.conf.d/rts.conf %{buildroot}%{ghclibdir}/include >> ghc-base-devel.files -%if 0%{?rhel} && 0%{?rhel} < 7 -ls %{buildroot}%{ghclibdir}/rts/libffi.so >> ghc-base-devel.files -%endif - -sed -i -e "s|^%{buildroot}||g" ghc-base*.files - -# these are handled as alternatives -for i in hsc2hs runhaskell; do - if [ -x %{buildroot}%{_bindir}/$i-ghc ]; then - rm %{buildroot}%{_bindir}/$i - else - mv %{buildroot}%{_bindir}/$i{,-ghc} - fi - touch %{buildroot}%{_bindir}/$i -done - -%ghc_strip_dynlinked - -%if %{with docs} -mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly -install -p --mode=0755 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/ghc-doc-index -mkdir -p %{buildroot}%{_localstatedir}/lib/ghc -touch %{buildroot}%{_localstatedir}/lib/ghc/pkg-dir.cache{,.new} -install -p --mode=0755 %SOURCE4 %{buildroot}%{_bindir}/ghc-doc-index - +rm -f rts.files +touch rts.files +ls %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%{ghclibdir}/rts}/libHSrts*-ghc%{ghc_version}.so >> rts.files +find %{buildroot}%{ghclibdir}/rts -type d -fprintf rts-devel.files '%%%%dir %p\n' -o -name 'libHSrts*_p.a' -fprint rts-prof.files -o -fprint rts-devel.files +echo "%{ghclibdir}/package.conf.d/rts.conf" >> rts-devel.files +sed -i -e "s!%{buildroot}!!g" rts.files rts-devel.files rts-prof.files +cat rts.files >> ghc-base.files +cat rts-devel.files >> ghc-base-devel.files +cat rts-prof.files >> ghc-base-prof.files + +%if %{with haddock} # generate initial lib doc index cd libraries sh %{gen_contents_index} --intree --verbose cd .. %endif -# we package the library license files separately -find %{buildroot}%{ghc_html_libraries_dir} -name LICENSE -exec rm '{}' ';' +mkdir -p %{buildroot}%{_mandir}/man1 +install -p -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/ghc-pkg.1 +install -p -m 0644 %{SOURCE6} %{buildroot}%{_mandir}/man1/haddock.1 +install -p -m 0644 %{SOURCE7} %{buildroot}%{_mandir}/man1/runghc.1 -# fix llvm paths -%ifarch %{ghc_llvm_archs} -sed -i -e "s!$PWD/llvm-%{llvm_version}.src/_build!%{ghclibdir}/llvm!" %{buildroot}%{ghclibdir}/settings +%ifarch armv7hl +export RPM_BUILD_NCPUS=1 %endif %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 @@ -547,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 @@ -559,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 @@ -592,36 +521,33 @@ make test %endif -%post compiler -# Alas, GHC, Hugs, and nhc all come with different set of tools in -# addition to a runFOO: -# -# * GHC: hsc2hs -# * Hugs: hsc2hs, cpphs -# * nhc: cpphs -# -# Therefore it is currently not possible to use --slave below to form -# link groups under a single name 'runhaskell'. Either these tools -# should be disentangled from the Haskell implementations, or all -# implementations should have the same set of tools. *sigh* - -update-alternatives --install %{_bindir}/runhaskell runhaskell \ - %{_bindir}/runghc 500 -update-alternatives --install %{_bindir}/hsc2hs hsc2hs \ - %{_bindir}/hsc2hs-ghc 500 - -%preun compiler -if [ "$1" = 0 ]; then - update-alternatives --remove runhaskell %{_bindir}/runghc - update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc -fi +%if %{defined ghclibdir} +%transfiletriggerin compiler -- %{ghclibdir}/package.conf.d +%ghc_pkg_recache +%end + +%transfiletriggerpostun compiler -- %{ghclibdir}/package.conf.d +%ghc_pkg_recache +%end + + +%if %{with haddock} +%transfiletriggerin doc-index -- %{ghc_html_libraries_dir} +env -C %{ghc_html_libraries_dir} ./gen_contents_index +%end + +%transfiletriggerpostun doc-index -- %{ghc_html_libraries_dir} +env -C %{ghc_html_libraries_dir} ./gen_contents_index +%end +%endif +%endif %files %files compiler %license LICENSE -%doc ANNOUNCE +%doc README.md %{_bindir}/ghc %{_bindir}/ghc-%{version} %{_bindir}/ghc-pkg @@ -630,11 +556,10 @@ fi %{_bindir}/ghci-%{version} %{_bindir}/hp2ps %{_bindir}/hpc -%ghost %{_bindir}/hsc2hs -%{_bindir}/hsc2hs-ghc -%{_bindir}/runghc* -%ghost %{_bindir}/runhaskell -%{_bindir}/runhaskell-ghc +%{_bindir}/hsc2hs +%{_bindir}/runghc +%{_bindir}/runghc-%{ghc_version} +%{_bindir}/runhaskell %dir %{ghclibdir}/bin %{ghclibdir}/bin/ghc %{ghclibdir}/bin/ghc-pkg @@ -642,95 +567,222 @@ fi %{ghclibdir}/bin/hsc2hs %{ghclibdir}/bin/ghc-iserv %{ghclibdir}/bin/ghc-iserv-dyn -%ifarch %{ghc_llvm_archs} -%license llvm-3.9.1.src/LICENSE.TXT -%{ghclibdir}/llvm -%endif -%if %{with prof} +%if %{with ghc_prof} %{ghclibdir}/bin/ghc-iserv-prof %endif %{ghclibdir}/bin/runghc -%ifnarch s390 s390x %{mips} -%{ghclibdir}/bin/ghc-split -%endif %{ghclibdir}/bin/hp2ps %{ghclibdir}/bin/unlit %{ghclibdir}/ghc-usage.txt %{ghclibdir}/ghci-usage.txt +%{ghclibdir}/llvm-passes +%{ghclibdir}/llvm-targets %dir %{ghclibdir}/package.conf.d %ghost %{ghclibdir}/package.conf.d/package.cache %{ghclibdir}/package.conf.d/package.cache.lock %{ghclibdir}/platformConstants %{ghclibdir}/settings %{ghclibdir}/template-hsc.h -%dir %{_docdir}/ghc -%dir %{ghc_html_dir} -%if %{with docs} -%{_bindir}/ghc-doc-index +%{_mandir}/man1/ghc-pkg.1* +%{_mandir}/man1/haddock.1* +%{_mandir}/man1/runghc.1* + +%if %{with haddock} %{_bindir}/haddock %{_bindir}/haddock-ghc-%{version} %{ghclibdir}/bin/haddock %{ghclibdir}/html %{ghclibdir}/latex -%if %{with docs} -# https://ghc.haskell.org/trac/ghc/ticket/12939 -%{_mandir}/man1/ghc.1* -%endif -%dir %{ghc_html_dir}/libraries %{ghc_html_dir}/libraries/gen_contents_index %{ghc_html_dir}/libraries/prologue.txt %ghost %{ghc_html_dir}/libraries/doc-index*.html +%ghost %{ghc_html_dir}/libraries/haddock-bundle.min.js %ghost %{ghc_html_dir}/libraries/haddock-util.js %ghost %{ghc_html_dir}/libraries/hslogo-16.png %ghost %{ghc_html_dir}/libraries/index*.html +%ghost %{ghc_html_dir}/libraries/linuwial.css %ghost %{ghc_html_dir}/libraries/minus.gif +%ghost %{ghc_html_dir}/libraries/new-ocean.css %ghost %{ghc_html_dir}/libraries/ocean.css %ghost %{ghc_html_dir}/libraries/plus.gif +%ghost %{ghc_html_dir}/libraries/quick-jump.css %ghost %{ghc_html_dir}/libraries/synopsis.png -%dir %{_localstatedir}/lib/ghc -%ghost %{_localstatedir}/lib/ghc/pkg-dir.cache -%ghost %{_localstatedir}/lib/ghc/pkg-dir.cache.new %endif - -%if %{with docs} -%files doc-cron -%config(noreplace) %{_sysconfdir}/cron.hourly/ghc-doc-index +%if %{with manual} +%{_mandir}/man1/ghc.1* %endif -%files libraries +%files devel +%if %{with haddock} +%files doc -%if %{with docs} +%files doc-index +%endif + +%if %{with manual} %files manual ## needs pandoc #%%{ghc_html_dir}/Cabal +%if %{with haddock} %{ghc_html_dir}/haddock %{ghc_html_dir}/index.html %{ghc_html_dir}/users_guide %endif +%endif + +%if %{with ghc_prof} +%files prof +%endif %changelog -* Tue Aug 14 2018 Petr Viktorin - 8.2.2-68.3 -- Fix BuildRequires for /usr/bin/python3 -- Resolves: #1615517 +* Fri Aug 18 2023 Alexey Lyubimov - 8.10.7-116 +- Rebuilt for MSVSphere 9.2 + +* 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 + +* Thu Jul 22 2021 Jens Petersen - 8.10.5-115 +- update to 8.10.5 with patch for missing rts symbols +- use llvm 11 for ARM +- https://downloads.haskell.org/~ghc/8.10.5/docs/html/users_guide/8.10.5-notes.html + +* Thu Jul 15 2021 Jens Petersen - 8.10.4-114 +- perf build -* Sat Jun 2 2018 Jens Petersen - 8.2.2-68.2 -- do not delete RPATH for bundled llvm -- fix docs config -- add llvm-D25865-cmakeshlib.patch from llvm3.9 +* Thu Jul 15 2021 Jens Petersen - 8.10.4-113 +- rebase to 8.10.4 from ghc:8.10 module stream +- https://downloads.haskell.org/ghc/8.10.4/docs/html/users_guide/8.10.1-notes.html +- use llvm10 for ARM + +* Wed Jun 30 2021 Jens Petersen - 8.8.4-111 +- fix build with sphinx4 (#1977317) + +* Tue May 25 2021 Jens Petersen - 8.8.4-110 +- ghc-compiler now requires ghc-filesystem for html docdirs + +* Tue Jan 26 2021 Fedora Release Engineering - 8.8.4-109 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 02 2020 David Abdurachmanov +- Add riscv64 to ghc_unregisterized_arches + +* Tue Aug 18 2020 Troy Dawson - 8.8.4-108 +- Cleanup old %if statements + +* Mon Jul 27 2020 Fedora Release Engineering - 8.8.4-107 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 16 2020 Jens Petersen - 8.8.4-106 +- 8.8.4 bugfix releases +- https://downloads.haskell.org/ghc/8.8.4/docs/html/users_guide/8.8.4-notes.html +- bytestring-0.10.10.1 and process-1.6.9.0 + +* Tue Jul 14 2020 Jens Petersen - 8.8.3-105 +- rebase to 8.8.3 from ghc:8.8 module stream +- https://downloads.haskell.org/ghc/8.8.1/docs/html/users_guide/8.8.1-notes.html +- https://downloads.haskell.org/ghc/8.8.2/docs/html/users_guide/8.8.2-notes.html +- https://downloads.haskell.org/ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html + +* Mon Jul 6 2020 Jens Petersen - 8.6.5-104 +- use python3-sphinx also for rhel8 + +* 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 + +* 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 +- https://downloads.haskell.org/~ghc/8.6.5/docs/html/users_guide/8.6.2-notes.html +- https://downloads.haskell.org/~ghc/8.6.5/docs/html/users_guide/8.6.3-notes.html +- https://downloads.haskell.org/~ghc/8.6.5/docs/html/users_guide/8.6.4-notes.html +- https://downloads.haskell.org/~ghc/8.6.5/docs/html/users_guide/8.6.5-notes.html +- fix process library initgroups issue + (https://github.com/haskell/process/pull/148) +- add fix-build-using-unregisterized-v8.4.patch for s390x (#1648537) + https://gitlab.haskell.org/ghc/ghc/issues/15913 +- add bigendian patch for containers (#1651448) + https://gitlab.haskell.org/ghc/ghc/issues/15411 +- Debian patches: + - add_-latomic_to_ghc-prim.patch, + - rts osReserveHeapMemory block alignment + +* Tue Jul 30 2019 Jens Petersen - 8.4.4-99 +- subpackage library haddock documentation and profiling libraries +- add ghc-doc and ghc-prof metapackages to pull in lib docs and prof libs +- rename ghc-doc-cron with ghc-doc-index using file triggers +- rename ghc-libraries to ghc-devel +- for quickbuild disable debuginfo +- lock ghc-compiler requires ghc-base-devel to ver-rel +- drop alternatives for runhaskell and hsc2hs +- use ghc_set_gcc_flags, with_ghc_prof, and with_haddock + +* Thu Jul 25 2019 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 28 2019 Jens Petersen - 8.4.4-75 +- add transfiletriggers that will replace individual post/postun scriptlets + +* Mon Mar 4 2019 Jens Petersen - 8.4.4-74 +- unregisterized: fix 32bit adjacent floats issue + (https://ghc.haskell.org/trac/ghc/ticket/15853) + +* Sat Feb 16 2019 Jens Petersen - 8.4.4-73 +- update to GHC 8.4 +- https://ghc.haskell.org/trac/ghc/blog/ghc-8.4.1-released +- new patches: + - 6e361d895dda4600a85e01c72ff219474b5c7190.patch + - fix-build-using-unregisterized-v8.2.patch + - ghc-sphinx-1.8-4eebc8016.patch +- dropped patch: + - D4159.patch + - ghc-7.8-arm7_saner-linker-opt-handling-9873.patch + - ghc-Debian-reproducible-tmp-names.patch +- rely on rpm to strip + +* Fri Feb 8 2019 Jens Petersen - 8.2.2-72 +- add ghc_unregisterized_arches +- Recommends zlib-devel +- epel6 tweaks + +* Thu Jan 31 2019 Fedora Release Engineering - 8.2.2-72 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 8.2.2-71 +- Use C.UTF-8 locale + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + +* Mon Oct 22 2018 Jens Petersen +- Recommends for ghc-manual and ghc-doc-cron -* Thu May 31 2018 Jens Petersen - 8.2.2-68.1 -- apply install_dirs.patch from llvm3.9 to fix llvm RPATHs -- use ghc_set_cflags -- turn off the testsuite +* Wed Oct 17 2018 Jens Petersen - 8.2.2-70 +- backport quickbuild config from 8.4 module and extend to perf_build +- disable -Wall on s390x like in 8.4 module to silence warning flood + and simplify setting of CFLAGS +- enable buildpath-abi-stability.patch (from Debian) +- setup build.mk in setup section, taken from copr and module -* Thu May 31 2018 Jens Petersen - 8.2.2-68 +* Tue Oct 16 2018 Peter Robinson +- Update alternatives dependencies + +* Fri Jul 13 2018 Fedora Release Engineering - 8.2.2-69 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 28 2018 Jens Petersen - 8.2.2-68 - fix sphinx-build version detection - merge bcond for haddock and manual - -* Tue May 29 2018 Jens Petersen -- bundle llvm-3.9 with ghc-compiler for aarch64 +- disable the testsuite to speed up builds +- version bootstrap and packaging fixes and tweaks * Mon May 28 2018 Jens Petersen - 8.2.2-67 - move manuals to new ghc-manual (noarch) @@ -746,6 +798,9 @@ fi * Fri Feb 09 2018 Igor Gnatenko - 8.2.2-65 - Escape macros in %%changelog +* Fri Aug 18 2023 Alexey Lyubimov - 8.10.7-116 +- Rebuilt for MSVSphere 9.2 + * Wed Feb 07 2018 Fedora Release Engineering - 8.2.2-64 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild