Hello community, here is the log from the commit of package ghc for openSUSE:Leap:15.2 checked in at 2020-02-19 18:37:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ghc (Old) and /work/SRC/openSUSE:Leap:15.2/.ghc.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc" Wed Feb 19 18:37:05 2020 rev:14 rq:771190 version:8.8.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ghc/ghc.changes 2020-01-15 15:00:34.257752067 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ghc.new.26092/ghc.changes 2020-02-19 18:37:07.393781373 +0100 @@ -1,0 +2,96 @@ +Wed Feb 5 11:16:13 UTC 2020 - Andreas Schwab <sch...@suse.de> + +- Fix typo in last change + +------------------------------------------------------------------- +Thu Jan 23 09:41:53 UTC 2020 - Peter Trommler <ptromm...@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.gar...@opensuse.org> + +- Update _constraints for aarch64 + +------------------------------------------------------------------- +Thu Jan 16 19:08:53 UTC 2020 - Peter Trommler <ptromm...@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...@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 <ptromm...@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 <ptromm...@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...@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...@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 <ptromm...@icloud.com> + +- add fix-build-using-unregisterized-v8.4.patch + * fixes unregisterised builds when bootstrap compiler is GHC 8.4 + * fixes build on s390x + +------------------------------------------------------------------- +Mon Sep 23 09:28:37 UTC 2019 - Andreas Schwab <sch...@suse.de> + +- Enable build on riscv64 +- Add memory constraints for riscv64, restrict to 2 jobs +- allow-riscv-and-riscv64-CPU.patch: recognize riscv64 as architecture +- Apply Disable-unboxed-arrays.patch also on s390x + +------------------------------------------------------------------- +Thu Apr 25 22:11:40 UTC 2019 - Ondřej Súkup <mimi...@gmail.com> + +- update to 8.6.5 + * A build system issue where use of GCC with -flto broke configure was fixed + +------------------------------------------------------------------- Old: ---- 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch D5212.patch ghc-8.6.4-src.tar.xz New: ---- fix-unregisterised-v8.4-8.6.patch ghc-8.8.2-src.tar.xz ghc-8.8.2-src.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.J7Xtg0/_old 2020-02-19 18:37:08.361783400 +0100 +++ /var/tmp/diff_new_pack.J7Xtg0/_new 2020-02-19 18:37:08.365783408 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,21 +26,25 @@ %define with_libnuma 0 %endif -%global unregisterised_archs s390 s390x +%global unregisterised_archs s390 s390x riscv64 Name: ghc -Version: 8.6.4 +Version: 8.8.2 Release: 0 -Url: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz +URL: https://www.haskell.org/ghc/ +Source: https://downloads.haskell.org/~ghc/8.8.2/ghc-%{version}-src.tar.xz +Source1: https://downloads.haskell.org/~ghc/8.8.2/ghc-%{version}-src.tar.xz.sig +Source2: ghc-rpmlintrc Summary: The Glorious Glasgow Haskell Compiler License: BSD-3-Clause Group: Development/Languages/Other -ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc64 ppc64le s390x +ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc64 ppc64le riscv64 s390x # hard to port to PIE, some prebuilt static libraries are non-PIC ... #!BuildIgnore: gcc-PIE BuildRequires: binutils-devel BuildRequires: gcc -BuildRequires: ghc-bootstrap >= 8.0 +BuildRequires: ghc-bootstrap >= 8.4 +BuildRequires: ghc-bootstrap-helpers BuildRequires: ghc-rpm-macros-extra BuildRequires: glibc-devel BuildRequires: gmp-devel @@ -65,9 +69,11 @@ %endif %ifarch aarch64 %{arm} %{ix86} x86_64 %if 0%{?suse_version} >= 1550 -BuildRequires: llvm6-devel +BuildRequires: llvm7 +Requires: llvm7 %else -BuildRequires: llvm-devel +BuildRequires: llvm +Requires: llvm %endif %endif %if %{undefined without_manual} @@ -78,21 +84,15 @@ BuildRequires: libnuma-devel %endif -# for patch 1 -BuildRequires: python3 - 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 ptromm...@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 ptromm...@icloud.com -- Fix GHCi on big endiansystems. Submitted for upstream review. -Patch2: D5212.patch + # PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do not use unboxed arrays on big-endian platforms. See Haskell Trac #15411. Patch3: Disable-unboxed-arrays.patch +# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch ptromm...@icloud.com -- Fix/workaround an issue with unregisterised builds bootstrapped with GHC 8.4 and 8.6. Similar to upstream ticket #15913. +Patch6: fix-unregisterised-v8.4-8.6.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. @@ -127,13 +127,20 @@ %ifarch aarch64 %{arm} Requires: binutils-gold %endif -%ifarch aarch64 %{arm} %{ix86} x86_64 +%ifarch aarch64 %{arm} %if 0%{?suse_version} >= 1550 -Requires: llvm6 +Requires: llvm7 %else Requires: llvm %endif %endif +%ifarch x86_64 %{ix86} +%if 0%{?suse_version} >= 1550 +Suggests: llvm7 +%else +Suggests: llvm +%endif +%endif %description compiler This package contains the GHC compiler, tools and utilities. @@ -152,14 +159,14 @@ %endif %if %{defined ghclibdir} -%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 Cabal-3.0.1.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.13.0.0 +%ghc_lib_subpackage -d binary-0.8.7.0 +%ghc_lib_subpackage -d bytestring-0.10.10.0 +%ghc_lib_subpackage -d containers-0.6.2.1 %ghc_lib_subpackage -d deepseq-1.4.4.0 -%ghc_lib_subpackage -d directory-1.3.3.0 +%ghc_lib_subpackage -d directory-1.3.4.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} @@ -167,18 +174,18 @@ %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.7.4.3 +%ghc_lib_subpackage -d haskeline-0.7.5.0 %ghc_lib_subpackage -d hpc-0.6.0.3 -%ghc_lib_subpackage -d libiserv-8.6.3 +%ghc_lib_subpackage -d libiserv-%{ghc_version_override} %ghc_lib_subpackage -d mtl-2.2.2 -%ghc_lib_subpackage -d parsec-3.1.13.0 +%ghc_lib_subpackage -d parsec-3.1.14.0 %ghc_lib_subpackage -d pretty-1.1.3.6 -%ghc_lib_subpackage -d process-1.6.5.0 +%ghc_lib_subpackage -d process-1.6.7.0 %ghc_lib_subpackage -d stm-2.5.0.0 -%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 template-haskell-2.15.0.0 +%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.4 +%ghc_lib_subpackage -d text-1.2.4.0 +%ghc_lib_subpackage -d time-1.9.3 %ghc_lib_subpackage -d transformers-0.5.6.2 %ghc_lib_subpackage -d unix-2.7.2.2 %ghc_lib_subpackage -d xhtml-3000.2.2.1 @@ -202,19 +209,15 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%ifarch ppc64 +%ifarch ppc64 s390 s390x %patch3 -p1 %endif +%patch6 -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 @@ -264,13 +267,13 @@ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ --with-system-libffi -%ifnarch s390 s390x %if 0%{?suse_version} >= 1500 -%limit_build -m 2000 -make %{?_smp_mflags} +%ifarch %{unregisterised_archs} +%limit_build -m 8000 %else -make -j 2 +%limit_build -m 2000 %endif +make %{?_smp_mflags} %else make -j 2 %endif @@ -285,7 +288,8 @@ name=$(echo $i | sed -e "s/\(.*\)-.*/\1/") ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/") %ghc_gen_filelists $name $ver -echo "%doc libraries/$name/LICENSE" >> ghc-$name.files +# TODO: containers have license in $name/$name +#echo "%%doc libraries/$name/LICENSE" >> ghc-$name.files done # ghc-base should own ghclibdir @@ -440,8 +444,7 @@ %{ghcdocbasedir}/users_guide %endif %{ghcdocbasedir}/libraries/gen_contents_index -%{ghcdocbasedir}/libraries/hslogo-16.png -%{ghcdocbasedir}/libraries/ocean.css +%{ghcdocbasedir}/libraries/linuwial.css %{ghcdocbasedir}/libraries/quick-jump.css %{ghcdocbasedir}/libraries/prologue.txt %{ghcdocbasedir}/libraries/synopsis.png ++++++ Disable-unboxed-arrays.patch ++++++ --- /var/tmp/diff_new_pack.J7Xtg0/_old 2020-02-19 18:37:08.377783433 +0100 +++ /var/tmp/diff_new_pack.J7Xtg0/_new 2020-02-19 18:37:08.377783433 +0100 @@ -1,7 +1,7 @@ -Index: ghc-8.6.1/libraries/containers/include/containers.h +Index: 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 +--- ghc-8.6.1.orig/libraries/containers/containers//include/containers.h ++++ ghc-8.6.1/libraries/containers/containers/include/containers.h @@ -35,7 +35,6 @@ #ifdef __GLASGOW_HASKELL__ ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.J7Xtg0/_old 2020-02-19 18:37:08.397783475 +0100 +++ /var/tmp/diff_new_pack.J7Xtg0/_new 2020-02-19 18:37:08.397783475 +0100 @@ -7,4 +7,25 @@ <size unit="G">4</size> </physicalmemory> </hardware> + <overwrite> + <conditions> + <arch>s390x</arch> + <arch>aarch64</arch> + </conditions> + <hardware> + <memory> + <size unit="G">10</size> + </memory> + </hardware> + </overwrite> + <overwrite> + <conditions> + <arch>riscv64</arch> + </conditions> + <hardware> + <memory> + <size unit="G">17</size> + </memory> + </hardware> + </overwrite> </constraints> ++++++ buildpath-abi-stability.patch ++++++ --- /var/tmp/diff_new_pack.J7Xtg0/_old 2020-02-19 18:37:08.401783483 +0100 +++ /var/tmp/diff_new_pack.J7Xtg0/_new 2020-02-19 18:37:08.405783492 +0100 @@ -1,8 +1,8 @@ -Index: ghc-8.6.1/compiler/iface/MkIface.hs +Index: ghc-8.8.1/compiler/iface/MkIface.hs =================================================================== ---- 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 +--- ghc-8.8.1.orig/compiler/iface/MkIface.hs ++++ ghc-8.8.1/compiler/iface/MkIface.hs +@@ -713,7 +713,7 @@ addFingerprints hsc_env mb_old_fingerpri iface_hash <- computeFingerprint putNameLiterally (mod_hash, ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache @@ -11,7 +11,7 @@ sorted_deps, mi_hpc iface0) -@@ -737,6 +737,9 @@ addFingerprints hsc_env mb_old_fingerpri +@@ -748,6 +748,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) ++++++ fix-unregisterised-v8.4-8.6.patch ++++++ Index: ghc-8.8.2/includes/stg/MiscClosures.h =================================================================== --- ghc-8.8.2.orig/includes/stg/MiscClosures.h +++ ghc-8.8.2/includes/stg/MiscClosures.h @@ -390,8 +390,12 @@ RTS_FUN_DECL(stg_copySmallMutableArrayzh RTS_FUN_DECL(stg_casSmallArrayzh); RTS_FUN_DECL(stg_newMutVarzh); +#if __GLASGOW_HASKELL__ < 808 +RTS_FUN_DECL(stg_atomicModifyMutVarzh); +#else RTS_FUN_DECL(stg_atomicModifyMutVar2zh); RTS_FUN_DECL(stg_atomicModifyMutVarzuzh); +#endif RTS_FUN_DECL(stg_casMutVarzh); RTS_FUN_DECL(stg_isEmptyMVarzh); ++++++ ghc-8.0.2-Cabal-dynlibdir.patch ++++++ --- /var/tmp/diff_new_pack.J7Xtg0/_old 2020-02-19 18:37:08.421783525 +0100 +++ /var/tmp/diff_new_pack.J7Xtg0/_new 2020-02-19 18:37:08.425783534 +0100 @@ -1,8 +1,8 @@ -Index: ghc-8.6.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs +Index: ghc-8.8.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs =================================================================== ---- 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 +--- ghc-8.8.1.orig/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs ++++ ghc-8.8.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs +@@ -205,7 +205,7 @@ defaultInstallDirs' False comp userInsta _other -> "$abi" </> "$libname", dynlibdir = "$libdir" </> case comp of UHC -> "$pkgid" ++++++ ghc-8.6.4-src.tar.xz -> ghc-8.8.2-src.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/ghc/ghc-8.6.4-src.tar.xz /work/SRC/openSUSE:Leap:15.2/.ghc.new.26092/ghc-8.8.2-src.tar.xz differ: char 25, line 1 ++++++ ghc-pie.patch ++++++ --- /var/tmp/diff_new_pack.J7Xtg0/_old 2020-02-19 18:37:08.469783626 +0100 +++ /var/tmp/diff_new_pack.J7Xtg0/_new 2020-02-19 18:37:08.469783626 +0100 @@ -1,8 +1,8 @@ -Index: ghc-8.6.1/compiler/main/DynFlags.hs +Index: ghc-8.8.1/compiler/main/DynFlags.hs =================================================================== ---- 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] +--- ghc-8.8.1.orig/compiler/main/DynFlags.hs ++++ ghc-8.8.1/compiler/main/DynFlags.hs +@@ -4511,6 +4511,7 @@ default_PIC :: Platform -> [GeneralFlag] default_PIC platform = case (platformOS platform, platformArch platform) of (OSDarwin, ArchX86_64) -> [Opt_PIC]
