Accepting request 1103611 from devel:languages:haskell

- update to 9.4.6
- remove fix_extlinks.patch and add bytestring.patch
 * Fix a bug where certain dictionaries for undecidable
    instances could end up looping at runtime
 * Fix a compiler panic involving newtype family instances
 * Fix a bug preventing using the command line
    to compile .cmm files to assembly
 * Fix compiler panics with certain RULE pragmas
 * Fix a loop in the simplifier due to a bug in
    the representation of certain fields in interface files
 * Make type equality (~) checks in the presence
    of quantified contrains more robust to argument ordering
 * Fix some segfaults when using UnliftedDataTypes
 * Improve bounds checking with -fcheck-prim-bounds
 * Fix a bug in the simplifier leading to core lint errors
 * Ensure array read operations have proper memory barries
 * Fix a spurious -dcore-lint failure with certain kinds of type family instances
 * Fix a bug with .hie files containing spurious references
    to generated functions in files with partial field selectors
 * With the aarch64 backend, fix a bug arising from lack
    of zero-extension for 8/16 bit add/sub with immediate
 * Fix a number of bugs having to do with default
    representation polymorphic type variables
 * Add support for top-level Addr# literals
 * Fix some tag inference bugs when using the bytecode interpreter
 * Support the foreign import prim calling convention in the bytecode interpreter
 * Support sized literals in the bytecode interpreter
 * Fix a bug with the handling of unboxed tuples in the bytecode interpreter
 * Make the bytecode interpreter more robust when run on optimised code
 * Accurately account for mutator allocations when using the non-moving GC (forwarded request 1103464 from mimi_vx)

OBS-URL: https://build.opensuse.org/request/show/1103611
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2023-08-13 17:17:43 +00:00 committed by Git OBS Bridge
commit c8d128b8a2
6 changed files with 61 additions and 44 deletions

13
bytestring.patch Normal file
View File

@ -0,0 +1,13 @@
Index: ghc-9.4.6/libraries/bytestring/cbits/is-valid-utf8.c
===================================================================
--- ghc-9.4.6.orig/libraries/bytestring/cbits/is-valid-utf8.c
+++ ghc-9.4.6/libraries/bytestring/cbits/is-valid-utf8.c
@@ -50,7 +50,7 @@ SUCH DAMAGE.
#endif
#include <MachDeps.h>
-#include "Rts.h"
+#include "ghcplatform.h"
#ifdef WORDS_BIGENDIAN
#define to_little_endian(x) __builtin_bswap64(x)

View File

@ -1,34 +0,0 @@
Index: ghc-9.4.4/docs/users_guide/ghc_config.py.in
===================================================================
--- ghc-9.4.4.orig/docs/users_guide/ghc_config.py.in 2022-12-23 16:19:02.000000000 +0000
+++ ghc-9.4.4/docs/users_guide/ghc_config.py.in 2023-01-30 21:30:24.105048683 +0000
@@ -1,6 +1,6 @@
extlinks = {
- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#%s'),
+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
}
libs_base_uri = '../libraries'
Index: ghc-9.4.4/libraries/Cabal/doc/conf.py
===================================================================
--- ghc-9.4.4.orig/libraries/Cabal/doc/conf.py 2022-12-23 16:19:53.000000000 +0000
+++ ghc-9.4.4/libraries/Cabal/doc/conf.py 2023-01-30 21:30:53.908929483 +0000
@@ -28,12 +28,12 @@ master_doc = 'index'
# extlinks -- see http://www.sphinx-doc.org/en/stable/ext/extlinks.html
extlinks = {
- 'issue': ('https://github.com/haskell/cabal/issues/%s', '#'),
+ 'issue': ('https://github.com/haskell/cabal/issues/%s', '#%s'),
- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', ''),
- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC #'),
+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', None),
+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC #%s'),
- 'hackage-pkg': ('http://hackage.haskell.org/package/%s', ''),
+ 'hackage-pkg': ('http://hackage.haskell.org/package/%s', None),
}
# General information about the project.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6256cf9caf6d6dc7b611dcfbb247df2d528e85aa39d22a698e870e5a590e8601
size 28641296

3
ghc-9.4.6-src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b705cf52692f9d4d6707cdf8e761590f5f56ec8ea6a65e36610db392d3d24b9
size 28594616

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Fri Aug 11 09:33:00 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>
- update to 9.4.6
- remove fix_extlinks.patch and add bytestring.patch
* Fix a bug where certain dictionaries for undecidable
instances could end up looping at runtime
* Fix a compiler panic involving newtype family instances
* Fix a bug preventing using the command line
to compile .cmm files to assembly
* Fix compiler panics with certain RULE pragmas
* Fix a loop in the simplifier due to a bug in
the representation of certain fields in interface files
* Make type equality (~) checks in the presence
of quantified contrains more robust to argument ordering
* Fix some segfaults when using UnliftedDataTypes
* Improve bounds checking with -fcheck-prim-bounds
* Fix a bug in the simplifier leading to core lint errors
* Ensure array read operations have proper memory barries
* Fix a spurious -dcore-lint failure with certain kinds of type family instances
* Fix a bug with .hie files containing spurious references
to generated functions in files with partial field selectors
* With the aarch64 backend, fix a bug arising from lack
of zero-extension for 8/16 bit add/sub with immediate
* Fix a number of bugs having to do with default
representation polymorphic type variables
* Add support for top-level Addr# literals
* Fix some tag inference bugs when using the bytecode interpreter
* Support the foreign import prim calling convention in the bytecode interpreter
* Support sized literals in the bytecode interpreter
* Fix a bug with the handling of unboxed tuples in the bytecode interpreter
* Make the bytecode interpreter more robust when run on optimised code
* Accurately account for mutator allocations when using the non-moving GC
* Prevent some segfaults by ensuring that pinned allocations respect block size
* Fix warnings with clang 14.0.3
* Allow building documentation with sphinx 6.0.0
* Fix some dependency tracking bugs with hadrian
-------------------------------------------------------------------
Sun Aug 6 16:34:18 UTC 2023 - Ondřej Súkup <mimi.vx@gmail.com>

View File

@ -16,8 +16,8 @@
#
%define full_version 9.4.5
%define short_version 9.4.5
%define full_version 9.4.6
%define short_version 9.4.6
%ifnarch s390x
%define with_libnuma 1
@ -66,7 +66,7 @@
%global ghc_llvm_archs s390x riscv64
%global ghc_unregisterized_arches noarch
%global base_ver 4.17.1.0
%global base_ver 4.17.2.0
%global ghc_compact_ver 0.1.0.0
%global hpc_ver 0.6.1.0
%global hsc2hs_ver 0.68.8
@ -93,7 +93,7 @@ Patch3: Disable-unboxed-arrays.patch
# PATCH-FIX-UPSTREAM execstack.patch -- RTS: Add stack marker to StgCRunAsm.S
Patch7: execstack.patch
# Work around a bug in Sphinx 6.1.x to fix the documentation build. Remove this patch ASAP.
Patch8: fix_extlinks.patch
Patch8: bytestring.patch
# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform
Patch35: ghc-pie.patch
Patch200: ghc-hadrian-s390x-rts--qg.patch
@ -239,7 +239,7 @@ This package provides the User Guide and Haddock manual.
%ghc_lib_subpackage -d array-0.5.4.0
%ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-%{base_ver}
%ghc_lib_subpackage -d binary-0.8.9.1
%ghc_lib_subpackage -d bytestring-0.11.4.0
%ghc_lib_subpackage -d bytestring-0.11.5.1
%ghc_lib_subpackage -d containers-0.6.7
%ghc_lib_subpackage -d deepseq-1.4.8.0
%ghc_lib_subpackage -d directory-1.3.7.1
@ -257,7 +257,7 @@ This package provides the User Guide and Haddock manual.
%ghc_lib_subpackage -d mtl-2.2.2
%ghc_lib_subpackage -d parsec-3.1.16.1
%ghc_lib_subpackage -d pretty-1.1.3.6
%ghc_lib_subpackage -d process-1.6.16.0
%ghc_lib_subpackage -d process-1.6.17.0
%ghc_lib_subpackage -d stm-2.5.1.0
%ghc_lib_subpackage -d template-haskell-2.19.0.0
%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.5
@ -398,7 +398,7 @@ echo "%%dir %{ghclibdir}" >> %{name}-base%{?_ghcdynlibdir:-devel}.files
%ghc_gen_filelists libiserv %{ghc_version_override}
%ghc_gen_filelists ghc-bignum 1.3
%ghc_gen_filelists ghc-prim 0.9.0
%ghc_gen_filelists ghc-prim 0.9.1
%ghc_gen_filelists integer-gmp 1.1
%ghc_gen_filelists rts 1.0.2