osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc revision:26, using keep-link
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=340
This commit is contained in:
Peter Simons
Git OBS Bridge
parent
9a0e49e560
commit
7a045e4488
60
0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
Normal file
60
0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From ce3897ffd6e7c8b8f36b8e920168bac8c7f836ae Mon Sep 17 00:00:00 2001
|
||||
From: Ilias Tsitsimpis <iliastsi@debian.org>
|
||||
Date: Tue, 18 Sep 2018 17:45:17 +0200
|
||||
Subject: [PATCH] Fix check whether GCC supports __atomic_ builtins
|
||||
|
||||
Summary:
|
||||
C11 atomics are never used because:
|
||||
|
||||
* The program used for checking whether GCC supports
|
||||
__atomic_ builtins fails with the following error:
|
||||
|
||||
```
|
||||
error: size mismatch in argument 2 of `__atomic_load`
|
||||
int test(int *x) { int y; __atomic_load(&x, &y, __ATOMIC_SEQ_CST); return x; }
|
||||
```
|
||||
|
||||
* There is a typo when checking if CONF_GCC_SUPPORTS__ATOMICS equals YES,
|
||||
resulting in PRIM_CFLAGS and PRIM_EXTRA_LIBRARIES never being set.
|
||||
|
||||
Reviewers: bgamari
|
||||
|
||||
Reviewed By: bgamari
|
||||
|
||||
Subscribers: rwbarton, erikd, carter
|
||||
|
||||
Differential Revision: https://phabricator.haskell.org/D5154
|
||||
---
|
||||
libraries/ghc-prim/aclocal.m4 | 2 +-
|
||||
libraries/ghc-prim/configure.ac | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libraries/ghc-prim/aclocal.m4 b/libraries/ghc-prim/aclocal.m4
|
||||
index e5695385f2..81fc44c500 100644
|
||||
--- a/libraries/ghc-prim/aclocal.m4
|
||||
+++ b/libraries/ghc-prim/aclocal.m4
|
||||
@@ -5,7 +5,7 @@ AC_DEFUN([FP_GCC_SUPPORTS__ATOMICS],
|
||||
[
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_MSG_CHECKING([whether GCC supports __atomic_ builtins])
|
||||
- echo 'int test(int *x) { int y; __atomic_load(&x, &y, __ATOMIC_SEQ_CST); return x; }' > conftest.c
|
||||
+ echo 'int test(int *x) { int y; __atomic_load(x, &y, __ATOMIC_SEQ_CST); return y; }' > conftest.c
|
||||
if $CC -c conftest.c > /dev/null 2>&1; then
|
||||
CONF_GCC_SUPPORTS__ATOMICS=YES
|
||||
AC_MSG_RESULT([yes])
|
||||
diff --git a/libraries/ghc-prim/configure.ac b/libraries/ghc-prim/configure.ac
|
||||
index bacc89ccc8..8249be31a9 100644
|
||||
--- a/libraries/ghc-prim/configure.ac
|
||||
+++ b/libraries/ghc-prim/configure.ac
|
||||
@@ -8,7 +8,7 @@ dnl unregisterised, Sparc, and PPC backends.
|
||||
FP_GCC_SUPPORTS__ATOMICS
|
||||
AC_DEFINE([HAVE_C11_ATOMICS], [$CONF_GCC_SUPPORTS__ATOMICS], [Does GCC support __atomic primitives?])
|
||||
|
||||
-if test "x$CONF_GCC_SUPPORTS__ATOMICS" = YES
|
||||
+if test "$CONF_GCC_SUPPORTS__ATOMICS" = "YES"
|
||||
then PRIM_CFLAGS=-DHAVE_C11_ATOMICS
|
||||
PRIM_EXTRA_LIBRARIES=atomic
|
||||
fi
|
||||
--
|
||||
2.13.7
|
||||
|
||||
23
D5212.patch
Normal file
23
D5212.patch
Normal file
@ -0,0 +1,23 @@
|
||||
Index: ghc-8.6.1/libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc
|
||||
===================================================================
|
||||
--- ghc-8.6.1.orig/libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc
|
||||
+++ ghc-8.6.1/libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc
|
||||
@@ -58,7 +58,7 @@ pokeItbl a0 itbl = do
|
||||
#endif
|
||||
(#poke StgInfoTable, layout.payload.ptrs) a0 (ptrs itbl)
|
||||
(#poke StgInfoTable, layout.payload.nptrs) a0 (nptrs itbl)
|
||||
- (#poke StgInfoTable, type) a0 (fromEnum (tipe itbl))
|
||||
+ (#poke StgInfoTable, type) a0 (toHalfWord (fromEnum (tipe itbl)))
|
||||
#if __GLASGOW_HASKELL__ > 804
|
||||
(#poke StgInfoTable, srt) a0 (srtlen itbl)
|
||||
#else
|
||||
@@ -71,6 +71,9 @@ pokeItbl a0 itbl = do
|
||||
Just (Left xs) -> pokeArray code_offset xs
|
||||
Just (Right xs) -> pokeArray code_offset xs
|
||||
#endif
|
||||
+ where
|
||||
+ toHalfWord :: Int -> HalfWord
|
||||
+ toHalfWord i = fromIntegral i
|
||||
|
||||
-- | Size in bytes of a standard InfoTable
|
||||
itblSize :: Int
|
||||
@ -1,7 +1,7 @@
|
||||
Index: ghc-8.6.1/libraries/containers/containers/include/containers.h
|
||||
Index: ghc-8.6.1/libraries/containers/include/containers.h
|
||||
===================================================================
|
||||
--- ghc-8.6.1.orig/libraries/containers/containers//include/containers.h
|
||||
+++ ghc-8.6.1/libraries/containers/containers/include/containers.h
|
||||
--- ghc-8.6.1.orig/libraries/containers/include/containers.h
|
||||
+++ ghc-8.6.1/libraries/containers/include/containers.h
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
#ifdef __GLASGOW_HASKELL__
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
</hardware>
|
||||
<overwrite>
|
||||
<conditions>
|
||||
<arch>aarch64</arch>
|
||||
<arch>s390x</arch>
|
||||
</conditions>
|
||||
<hardware>
|
||||
|
||||
31
allow-riscv-and-riscv64-CPU.patch
Normal file
31
allow-riscv-and-riscv64-CPU.patch
Normal file
@ -0,0 +1,31 @@
|
||||
Description: cherry-pick of upstream commits
|
||||
beba89a0f16681c85d39fc8a894bde4162ff492a.patch:
|
||||
5e63a25249f3cb07300258e115af9ff55079d2ea.patch:
|
||||
Last-Update: 2019-05-27
|
||||
|
||||
Index: ghc-8.6.5/aclocal.m4
|
||||
===================================================================
|
||||
--- ghc-8.6.5.orig/aclocal.m4
|
||||
+++ ghc-8.6.5/aclocal.m4
|
||||
@@ -217,7 +217,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
|
||||
mipsel)
|
||||
test -z "[$]2" || eval "[$]2=ArchMipsel"
|
||||
;;
|
||||
- hppa|hppa1_1|ia64|m68k|nios2|rs6000|s390|s390x|sh4|vax)
|
||||
+ hppa|hppa1_1|ia64|m68k|nios2|riscv32|riscv64|rs6000|s390|s390x|sh4|vax)
|
||||
test -z "[$]2" || eval "[$]2=ArchUnknown"
|
||||
;;
|
||||
*)
|
||||
@@ -1906,6 +1906,12 @@ case "$1" in
|
||||
powerpc*)
|
||||
$2="powerpc"
|
||||
;;
|
||||
+ riscv64*)
|
||||
+ $2="riscv64"
|
||||
+ ;;
|
||||
+ riscv|riscv32*)
|
||||
+ $2="riscv32"
|
||||
+ ;;
|
||||
rs6000)
|
||||
$2="rs6000"
|
||||
;;
|
||||
@ -1,8 +1,8 @@
|
||||
Index: ghc-8.10.0.20191210/compiler/iface/MkIface.hs
|
||||
Index: ghc-8.6.1/compiler/iface/MkIface.hs
|
||||
===================================================================
|
||||
--- ghc-8.10.0.20191210.orig/compiler/iface/MkIface.hs
|
||||
+++ ghc-8.10.0.20191210/compiler/iface/MkIface.hs
|
||||
@@ -679,7 +679,7 @@ addFingerprints hsc_env iface0
|
||||
--- ghc-8.6.1.orig/compiler/iface/MkIface.hs
|
||||
+++ ghc-8.6.1/compiler/iface/MkIface.hs
|
||||
@@ -702,7 +702,7 @@ addFingerprints hsc_env mb_old_fingerpri
|
||||
iface_hash <- computeFingerprint putNameLiterally
|
||||
(mod_hash,
|
||||
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
|
||||
@ -11,9 +11,9 @@ Index: ghc-8.10.0.20191210/compiler/iface/MkIface.hs
|
||||
sorted_deps,
|
||||
mi_hpc iface0)
|
||||
|
||||
@@ -714,6 +714,9 @@ addFingerprints hsc_env iface0
|
||||
(non_orph_rules, orph_rules) = mkOrphMap ifRuleOrph (mi_rules iface0)
|
||||
@@ -737,6 +737,9 @@ addFingerprints hsc_env mb_old_fingerpri
|
||||
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
|
||||
fix_fn = mi_fix_fn 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 ]
|
||||
|
||||
58
fix-build-using-unregisterized-v8.4.patch
Normal file
58
fix-build-using-unregisterized-v8.4.patch
Normal file
@ -0,0 +1,58 @@
|
||||
Description: Allow unregisterised ghc-8.4 to build newer GHC
|
||||
Commit 4075656e8bb introduced a regression stopping existing unregisteristed
|
||||
compilers from being able to compile newer versions of GHC. The problem is
|
||||
that the bootstrap compiler uses the newer `rts/storage/ClosureTypes.h` file
|
||||
where some defines have been renamed, resulting in the following error:
|
||||
.
|
||||
error: ‘stg_MUT_ARR_PTRS_FROZEN0_info’ undeclared (first use in this function); did you mean ‘stg_MUT_ARR_PTRS_FROZEN_DIRTY_info’?
|
||||
.
|
||||
For more information, see https://gitlab.haskell.org/ghc/ghc/issues/15913.
|
||||
.
|
||||
This patch can be removed, once ghc-8.4 is no longer the bootstrap compiler.
|
||||
Author: Ilias Tsitsimpis <iliastsi@debian.org>
|
||||
Bug: https://gitlab.haskell.org/ghc/ghc/issues/15913
|
||||
Bug-Debian: https://bugs.debian.org/932941
|
||||
|
||||
Index: b/includes/rts/storage/ClosureTypes.h
|
||||
===================================================================
|
||||
--- a/includes/rts/storage/ClosureTypes.h
|
||||
+++ b/includes/rts/storage/ClosureTypes.h
|
||||
@@ -82,5 +82,11 @@
|
||||
#define SMALL_MUT_ARR_PTRS_DIRTY 60
|
||||
#define SMALL_MUT_ARR_PTRS_FROZEN_DIRTY 61
|
||||
#define SMALL_MUT_ARR_PTRS_FROZEN_CLEAN 62
|
||||
+#if __GLASGOW_HASKELL__ < 806
|
||||
+#define SMALL_MUT_ARR_PTRS_FROZEN0 SMALL_MUT_ARR_PTRS_FROZEN_DIRTY
|
||||
+#define SMALL_MUT_ARR_PTRS_FROZEN SMALL_MUT_ARR_PTRS_FROZEN_CLEAN
|
||||
+#define MUT_ARR_PTRS_FROZEN0 MUT_ARR_PTRS_FROZEN_DIRTY
|
||||
+#define MUT_ARR_PTRS_FROZEN MUT_ARR_PTRS_FROZEN_CLEAN
|
||||
+#endif
|
||||
#define COMPACT_NFDATA 63
|
||||
#define N_CLOSURE_TYPES 64
|
||||
Index: b/includes/stg/MiscClosures.h
|
||||
===================================================================
|
||||
--- a/includes/stg/MiscClosures.h
|
||||
+++ b/includes/stg/MiscClosures.h
|
||||
@@ -116,12 +116,22 @@ RTS_ENTRY(stg_ARR_WORDS);
|
||||
RTS_ENTRY(stg_MUT_ARR_WORDS);
|
||||
RTS_ENTRY(stg_MUT_ARR_PTRS_CLEAN);
|
||||
RTS_ENTRY(stg_MUT_ARR_PTRS_DIRTY);
|
||||
+#if __GLASGOW_HASKELL__ < 806
|
||||
+RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN);
|
||||
+RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN0);
|
||||
+#else
|
||||
RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN_CLEAN);
|
||||
RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN_DIRTY);
|
||||
+#endif
|
||||
RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_CLEAN);
|
||||
RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_DIRTY);
|
||||
+#if __GLASGOW_HASKELL__ < 806
|
||||
+RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN);
|
||||
+RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN0);
|
||||
+#else
|
||||
RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN_CLEAN);
|
||||
RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN_DIRTY);
|
||||
+#endif
|
||||
RTS_ENTRY(stg_MUT_VAR_CLEAN);
|
||||
RTS_ENTRY(stg_MUT_VAR_DIRTY);
|
||||
RTS_ENTRY(stg_END_TSO_QUEUE);
|
||||
@ -1,8 +1,8 @@
|
||||
Index: ghc-8.10.0.20200123/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
|
||||
Index: ghc-8.6.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
|
||||
===================================================================
|
||||
--- ghc-8.10.0.20200123.orig/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
|
||||
+++ ghc-8.10.0.20200123/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
|
||||
@@ -207,7 +207,7 @@ defaultInstallDirs' False comp userInsta
|
||||
--- ghc-8.6.1.orig/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
|
||||
+++ ghc-8.6.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
|
||||
@@ -204,7 +204,7 @@ defaultInstallDirs' False comp userInsta
|
||||
_other -> "$abi" </> "$libname",
|
||||
dynlibdir = "$libdir" </> case comp of
|
||||
UHC -> "$pkgid"
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9c573a4621a78723950617c223559bdc325ea6a3409264aedf68f05510b0880b
|
||||
size 21880680
|
||||
Binary file not shown.
3
ghc-8.6.5-src.tar.xz
Normal file
3
ghc-8.6.5-src.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4d4aa1e96f4001b934ac6193ab09af5d6172f41f5a5d39d8e43393b9aafee361
|
||||
size 19092168
|
||||
@ -1,8 +1,8 @@
|
||||
Index: ghc-8.10.0.20200123/compiler/main/DynFlags.hs
|
||||
Index: ghc-8.6.1/compiler/main/DynFlags.hs
|
||||
===================================================================
|
||||
--- ghc-8.10.0.20200123.orig/compiler/main/DynFlags.hs
|
||||
+++ ghc-8.10.0.20200123/compiler/main/DynFlags.hs
|
||||
@@ -4624,6 +4624,7 @@ default_PIC :: Platform -> [GeneralFlag]
|
||||
--- ghc-8.6.1.orig/compiler/main/DynFlags.hs
|
||||
+++ ghc-8.6.1/compiler/main/DynFlags.hs
|
||||
@@ -4317,6 +4317,7 @@ default_PIC :: Platform -> [GeneralFlag]
|
||||
default_PIC platform =
|
||||
case (platformOS platform, platformArch platform) of
|
||||
(OSDarwin, ArchX86_64) -> [Opt_PIC]
|
||||
|
||||
131
ghc.changes
131
ghc.changes
@ -1,136 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 9 11:27:32 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- update to 8.10.2
|
||||
* Fixes a code generation bug resulting in incorrect code generation
|
||||
for foreign calls with complex arguments
|
||||
* Fixes a bug causing object merging to fail when the lld linker is in use
|
||||
* Introduces a workaround for a Linux kernel bug in the implementation
|
||||
of the timerfd mechanism
|
||||
* Fixes a few specialiser regressions as well introduces a variety
|
||||
of miscellaneous specialiser improvements
|
||||
* Fixes a potential loss of sharing due to left operator sections
|
||||
* Fix bootstrapping of GHC with the LLVM backend on x86-64
|
||||
* few important correctness fixes for the low-latency garbage collector.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 31 18:47:18 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- cleanup specfile from Leap 42 and older remrants
|
||||
- drop fix-unregisterised-v8.4-8.6.patch
|
||||
- drop fix-build-using-unregisterized-v8.4.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 7 07:44:47 UTC 2020 - Peter Simons <psimons@suse.com>
|
||||
|
||||
- Update ghc to version 8.10.1. Important changes are:
|
||||
|
||||
* The UnliftedNewtypes extension, allowing newtypes to be wrap
|
||||
types of kind other than Type.
|
||||
|
||||
* The StandaloneKindSignatures extension, allowing explicit
|
||||
signatures on type constructors.
|
||||
|
||||
* A new, low-latency garbage collector for the oldest generation.
|
||||
|
||||
Please refer to the compiler documentation for all details:
|
||||
https://downloads.haskell.org/~ghc/8.10.1/docs/html/users_guide/8.10.1-notes.html
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 27 08:47:53 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- update to 8.8.3
|
||||
* a compiler panic due to over-zealous eta reduction
|
||||
* the ability to bootstrap with earlier 8.8 releases has been restored
|
||||
* the directory submodule has been updated
|
||||
* the process submodule has been updated
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 17 16:43:22 UTC 2020 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
- Increase memory limit for qemu user-space builds
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 5 11:16:13 UTC 2020 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
- Fix typo in last change
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 23 09:41:53 UTC 2020 - Peter Trommler <ptrommler@icloud.com>
|
||||
|
||||
- use ghc-bootstrap-helpers on all archs
|
||||
- lower build env requirements on riscv64
|
||||
* make sure we can build on smaller systems
|
||||
* adjust parallelism so we don't hog big workers for almost a week
|
||||
* many thanks to Stefan Bruens for pointing out the issue and
|
||||
helping with the solution
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 21 07:47:13 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update _constraints for aarch64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 16 19:08:53 UTC 2020 - Peter Trommler <ptrommler@icloud.com>
|
||||
|
||||
- drop 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
|
||||
* fixed upstream
|
||||
- drop D5212.patch
|
||||
* fixed upstream
|
||||
- drop fix-build-using-unregisterized-v8.4.patch
|
||||
* bootstrap compiler is 8.6.5 now
|
||||
- refresh fix-unregisterised-v8.4-8.6.patch
|
||||
- clean up spec file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 16 17:56:27 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- update to 8.8.2
|
||||
* A bug (Issue #17088) in the compacting garbage collector resulting in segmentation
|
||||
faults under specific circumstances. Note that this may affect user programs even
|
||||
if they did not explicitly request the compacting GC (using the -c RTS flag)
|
||||
since GHC may fallback to compacting collection during times of high memory pressure.
|
||||
* A code generator bug (Issue #17334) resulting in GHC panics has been fixed.
|
||||
* A typechecker bug (Issue #17112) resulting in GHC panicking on some programs
|
||||
has been fixed.
|
||||
* A bug (Issue #16707) in the implementation of software transactional memory
|
||||
potentially resulting in hanging transactions has been fixed.
|
||||
* A bug in the implementation of compact normal forms resulting in segmentation
|
||||
faults in some uses (Issue #17044) has been fixed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 31 18:17:24 UTC 2019 - Peter Trommler <ptrommler@icloud.com>
|
||||
|
||||
- add fix-unregisterised-v8.4-8.6.patch
|
||||
* fix build on s390x and riscv64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 30 12:08:41 UTC 2019 - Peter Trommler <ptrommler@icloud.com>
|
||||
|
||||
- refresh buildpath-abi-stability.patch
|
||||
- refresh ghc-8.0.2-Cabal-dynlibdir.patch
|
||||
- refresh ghc-pie.patch
|
||||
- enable riscv64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 29 13:10:39 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- use prebuilt alex and happy on Tumbleweed to avoid buildcycle
|
||||
- Don't require llvm in ghc-compiler for other architectures than arm
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 28 22:38:34 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- update to 8.8.1 -new stable release
|
||||
- refresh Disable-unboxed-arrays.patch
|
||||
- drop allow-riscv-and-riscv64-CPU.patch - merged in upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 23 10:07:24 UTC 2019 - Peter Trommler <ptrommler@icloud.com>
|
||||
|
||||
- add fix-build-using-unregisterized-v8.4.patch
|
||||
* fixes unregisterised builds when bootstrap compiler is GHC 8.4
|
||||
* fixes build on s390x
|
||||
* fixes build on s390x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 23 09:28:37 UTC 2019 - Andreas Schwab <schwab@suse.de>
|
||||
@ -154,7 +27,7 @@ Wed Mar 13 14:35:13 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 12 09:20:14 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- bump llvm req to llvm6
|
||||
- bump llvm req to llvm6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 6 08:49:44 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
141
ghc.spec
141
ghc.spec
@ -16,6 +16,10 @@
|
||||
#
|
||||
|
||||
|
||||
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
|
||||
%define without_manual 1
|
||||
%endif
|
||||
|
||||
%ifnarch %{arm} s390x
|
||||
%define with_libnuma 1
|
||||
%else
|
||||
@ -23,30 +27,36 @@
|
||||
%endif
|
||||
|
||||
%global unregisterised_archs s390 s390x riscv64
|
||||
%define full_version 8.10.2
|
||||
|
||||
Name: ghc
|
||||
Version: 8.10.2
|
||||
Version: 8.6.5
|
||||
Release: 0
|
||||
URL: https://www.haskell.org/ghc/
|
||||
Source: https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz
|
||||
Source1: https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz.sig
|
||||
Source2: ghc-rpmlintrc
|
||||
Url: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
|
||||
Summary: The Glorious Glasgow Haskell Compiler
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Languages/Other
|
||||
ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc64 ppc64le riscv64 s390x
|
||||
ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc64 ppc64le s390x riscv64
|
||||
# hard to port to PIE, some prebuilt static libraries are non-PIC ...
|
||||
#!BuildIgnore: gcc-PIE
|
||||
BuildRequires: binutils-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: ghc-bootstrap >= 8.6
|
||||
BuildRequires: ghc-bootstrap >= 8.0
|
||||
BuildRequires: ghc-rpm-macros-extra
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: libdw-devel
|
||||
BuildRequires: libelf-devel
|
||||
#Fix for openSUSE:Leap:42.1
|
||||
%if 0%{?suse_version} == 1315
|
||||
BuildRequires: libffi48-devel
|
||||
%else
|
||||
BuildRequires: libffi-devel
|
||||
%endif
|
||||
BuildRequires: libtool
|
||||
# not resolvable on ppc
|
||||
%if 0%{?suse_version} >= 1500
|
||||
BuildRequires: memory-constraints
|
||||
%endif
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: xz
|
||||
@ -55,11 +65,9 @@ BuildRequires: binutils-gold
|
||||
%endif
|
||||
%ifarch aarch64 %{arm} %{ix86} x86_64
|
||||
%if 0%{?suse_version} >= 1550
|
||||
BuildRequires: llvm9-devel
|
||||
BuildRequires: clang9
|
||||
BuildRequires: llvm6-devel
|
||||
%else
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: clang
|
||||
%endif
|
||||
%endif
|
||||
%if %{undefined without_manual}
|
||||
@ -70,16 +78,25 @@ BuildRequires: python3-Sphinx
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
|
||||
# for patch 1
|
||||
BuildRequires: python3
|
||||
|
||||
BuildRequires: ghc-bootstrap-helpers
|
||||
PreReq: update-alternatives
|
||||
|
||||
Requires: ghc-compiler = %{version}-%{release}
|
||||
Requires: ghc-ghc-devel = %{version}-%{release}
|
||||
Requires: ghc-libraries = %{version}-%{release}
|
||||
|
||||
Source: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
|
||||
Source1: ghc-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch ptrommler@icloud.com -- Fix __atomic_builtin detection. Patch taken from upstream commit ce3897ff.
|
||||
Patch1: 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
|
||||
# PATCH-FIX-UPSTREAM D5212.patch ptrommler@icloud.com -- Fix GHCi on big endiansystems. Submitted for upstream review.
|
||||
Patch2: D5212.patch
|
||||
# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptrommler@icloud.com -- Do not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
|
||||
Patch3: Disable-unboxed-arrays.patch
|
||||
# PATCH-FIX-UPSTREAM allow-riscv-and-riscv64-CPU.patch slyfox@gentoo.org -- aclocal.m4: allow riscv and riscv64 CPU
|
||||
Patch4: allow-riscv-and-riscv64-CPU.patch
|
||||
# PATCH-FIX-UPSTREAM fix-build-using-unregisterized-v8.4.patch
|
||||
Patch5: fix-build-using-unregisterized-v8.4.patch
|
||||
# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform
|
||||
Patch35: ghc-pie.patch
|
||||
# PATCH-FIX-OPENSUSE ghc-8.0.2-Cabal-dynlibdir.patch -- Fix shared library directory location.
|
||||
@ -114,22 +131,11 @@ Requires(postun): update-alternatives
|
||||
%ifarch aarch64 %{arm}
|
||||
Requires: binutils-gold
|
||||
%endif
|
||||
%ifarch aarch64 %{arm}
|
||||
%ifarch aarch64 %{arm} %{ix86} x86_64
|
||||
%if 0%{?suse_version} >= 1550
|
||||
Requires: clang9
|
||||
Requires: llvm9
|
||||
Requires: llvm6
|
||||
%else
|
||||
Requires: llvm
|
||||
Requires: clang
|
||||
%endif
|
||||
%endif
|
||||
%ifarch x86_64 %{ix86}
|
||||
%if 0%{?suse_version} >= 1550
|
||||
Suggests: clang9
|
||||
Suggests: llvm9
|
||||
%else
|
||||
Suggests: llvm
|
||||
Suggests: clang
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@ -150,15 +156,14 @@ To install all of GHC install package ghc.
|
||||
%endif
|
||||
|
||||
%if %{defined ghclibdir}
|
||||
%ghc_lib_subpackage -d Cabal-3.2.0.0
|
||||
%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-4.14.1.0
|
||||
%ghc_lib_subpackage -d binary-0.8.8.0
|
||||
%ghc_lib_subpackage -d bytestring-0.10.10.0
|
||||
%ghc_lib_subpackage -d containers-0.6.2.1
|
||||
%ghc_lib_subpackage -d Cabal-2.4.0.1
|
||||
%ghc_lib_subpackage -d array-0.5.3.0
|
||||
%ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-4.12.0.0
|
||||
%ghc_lib_subpackage -d binary-0.8.6.0
|
||||
%ghc_lib_subpackage -d bytestring-0.10.8.2
|
||||
%ghc_lib_subpackage -d containers-0.6.0.1
|
||||
%ghc_lib_subpackage -d deepseq-1.4.4.0
|
||||
%ghc_lib_subpackage -d directory-1.3.6.0
|
||||
%ghc_lib_subpackage -d exceptions-0.10.4
|
||||
%ghc_lib_subpackage -d directory-1.3.3.0
|
||||
%ghc_lib_subpackage -d filepath-1.4.2.1
|
||||
%ghc_lib_subpackage -d -x ghc-%{ghc_version_override}
|
||||
%ghc_lib_subpackage -d ghc-boot-%{ghc_version_override}
|
||||
@ -166,20 +171,19 @@ To install all of GHC install package ghc.
|
||||
%ghc_lib_subpackage -d ghc-compact-0.1.0.0
|
||||
%ghc_lib_subpackage -d ghc-heap-%{ghc_version_override}
|
||||
%ghc_lib_subpackage -d -x ghci-%{ghc_version_override}
|
||||
%ghc_lib_subpackage -d haskeline-0.8.0.1
|
||||
%ghc_lib_subpackage -d hpc-0.6.1.0
|
||||
%ghc_lib_subpackage -d libiserv-%{ghc_version_override}
|
||||
%ghc_lib_subpackage -d haskeline-0.7.4.3
|
||||
%ghc_lib_subpackage -d hpc-0.6.0.3
|
||||
%ghc_lib_subpackage -d libiserv-8.6.3
|
||||
%ghc_lib_subpackage -d mtl-2.2.2
|
||||
%ghc_lib_subpackage -d parsec-3.1.14.0
|
||||
%ghc_lib_subpackage -d parsec-3.1.13.0
|
||||
%ghc_lib_subpackage -d pretty-1.1.3.6
|
||||
%ghc_lib_subpackage -d process-1.6.9.0
|
||||
%ghc_lib_subpackage -d process-1.6.5.0
|
||||
%ghc_lib_subpackage -d stm-2.5.0.0
|
||||
%ghc_lib_subpackage -d template-haskell-2.16.0.0
|
||||
%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.4
|
||||
%ghc_lib_subpackage -d text-1.2.3.2
|
||||
%ghc_lib_subpackage -d time-1.9.3
|
||||
%ghc_lib_subpackage -d template-haskell-2.14.0.0
|
||||
%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.2
|
||||
%ghc_lib_subpackage -d text-1.2.3.1
|
||||
%ghc_lib_subpackage -d time-1.8.0.2
|
||||
%ghc_lib_subpackage -d transformers-0.5.6.2
|
||||
# 2.8.0.0
|
||||
%ghc_lib_subpackage -d unix-2.7.2.2
|
||||
%ghc_lib_subpackage -d xhtml-3000.2.2.1
|
||||
%endif
|
||||
@ -202,14 +206,21 @@ except the ghc library, which is installed by the toplevel ghc metapackage.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%ifarch ppc64 s390 s390x
|
||||
%patch3 -p1
|
||||
%endif
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch35 -p1
|
||||
%patch100 -p1
|
||||
%patch110 -p1
|
||||
|
||||
%build
|
||||
# patch 1 modifies build system, we need to recreate configure
|
||||
./boot
|
||||
|
||||
cat > mk/build.mk <<EOF
|
||||
%ifarch aarch64 %{arm}
|
||||
BuildFlavour = perf-llvm
|
||||
@ -259,31 +270,28 @@ export CFLAGS="${CFLAGS:-%optflags}"
|
||||
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
|
||||
--with-system-libffi
|
||||
|
||||
%ifnarch s390 s390x riscv64
|
||||
%if 0%{?suse_version} >= 1500
|
||||
%ifarch %{unregisterised_archs}
|
||||
%if 0%{?qemu_user_space_build}
|
||||
%limit_build -m 15000
|
||||
%else
|
||||
%limit_build -m 8000
|
||||
%endif
|
||||
%else
|
||||
%limit_build -m 2000
|
||||
%endif
|
||||
make %{?_smp_mflags}
|
||||
%else
|
||||
make -j 2
|
||||
%endif
|
||||
|
||||
%else
|
||||
make
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if 0%{?suse_version} <= 1320
|
||||
%ghc_suse_disable_debug_packages
|
||||
%endif
|
||||
%makeinstall
|
||||
|
||||
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
|
||||
# TODO: containers have license in $name/$name
|
||||
#echo "%%doc libraries/$name/LICENSE" >> ghc-$name.files
|
||||
echo "%doc libraries/$name/LICENSE" >> ghc-$name.files
|
||||
done
|
||||
|
||||
# ghc-base should own ghclibdir
|
||||
@ -291,8 +299,8 @@ echo "%dir %{ghclibdir}" >> ghc-base.files
|
||||
|
||||
%ghc_gen_filelists ghc %{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
|
||||
%ghc_gen_filelists ghc-prim 0.5.3
|
||||
%ghc_gen_filelists integer-gmp 1.0.2.0
|
||||
|
||||
%define merge_filelist()\
|
||||
cat ghc-%1.files >> ghc-%2.files\
|
||||
@ -324,6 +332,10 @@ for i in hsc2hs runhaskell; do
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/$i
|
||||
done
|
||||
|
||||
%if 0%{?suse_version} <= 1320
|
||||
%ghc_strip_dynlinked
|
||||
%endif
|
||||
|
||||
find %{buildroot}%{ghclibdocdir} -name LICENSE -exec rm '{}' ';'
|
||||
|
||||
%check
|
||||
@ -375,6 +387,7 @@ fi
|
||||
|
||||
%files compiler
|
||||
%license LICENSE
|
||||
%doc ANNOUNCE
|
||||
%{_bindir}/ghc
|
||||
%{_bindir}/ghc-%{version}
|
||||
%{_bindir}/ghc-pkg
|
||||
@ -402,6 +415,9 @@ fi
|
||||
%{ghclibdir}/bin/hp2ps
|
||||
%{ghclibdir}/bin/hpc
|
||||
%{ghclibdir}/bin/hsc2hs
|
||||
%ifnarch %{unregisterised_archs}
|
||||
%{ghclibdir}/bin/ghc-split
|
||||
%endif
|
||||
%{ghclibdir}/ghc-usage.txt
|
||||
%{ghclibdir}/ghci-usage.txt
|
||||
%dir %{ghclibdir}/package.conf.d
|
||||
@ -430,7 +446,9 @@ fi
|
||||
%{ghcdocbasedir}/users_guide
|
||||
%endif
|
||||
%{ghcdocbasedir}/libraries/gen_contents_index
|
||||
%{ghcdocbasedir}/libraries/*.css
|
||||
%{ghcdocbasedir}/libraries/hslogo-16.png
|
||||
%{ghcdocbasedir}/libraries/ocean.css
|
||||
%{ghcdocbasedir}/libraries/quick-jump.css
|
||||
%{ghcdocbasedir}/libraries/prologue.txt
|
||||
%{ghcdocbasedir}/libraries/synopsis.png
|
||||
%{ghcdocbasedir}/index.html
|
||||
@ -441,6 +459,11 @@ fi
|
||||
%ghost %{ghcdocbasedir}/libraries/minus.gif
|
||||
%ghost %{ghcdocbasedir}/libraries/plus.gif
|
||||
%endif
|
||||
# With 1.7.4 of ghc-rpm-macros license files are installed here
|
||||
# but rpm does not own this directory on older openSUSE.
|
||||
%if 0%{?suse_version} <= 1320
|
||||
%dir %{_datadir}/licenses
|
||||
%endif
|
||||
|
||||
%files libraries
|
||||
%license LICENSE
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user