From 42a735a8e0b3355f4822d5749b1beab9e8f8487bed335e850e1a6b7fe42fc032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Tue, 7 Sep 2021 15:04:09 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc revision:52, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=361 --- 4134.patch | 42 -------------------------------------- ghc-8.10.4-src.tar.xz | 3 --- ghc-8.10.4-src.tar.xz.sig | Bin 586 -> 0 bytes ghc-8.10.7-src.tar.xz | 3 +++ ghc-8.10.7-src.tar.xz.sig | Bin 0 -> 438 bytes ghc-pie.patch | 22 ++++++++++---------- ghc.changes | 42 ++++++++++++++++++++++++++++++++++++++ ghc.spec | 25 ++++++++++------------- 8 files changed, 67 insertions(+), 70 deletions(-) delete mode 100644 4134.patch delete mode 100644 ghc-8.10.4-src.tar.xz delete mode 100644 ghc-8.10.4-src.tar.xz.sig create mode 100644 ghc-8.10.7-src.tar.xz create mode 100644 ghc-8.10.7-src.tar.xz.sig diff --git a/4134.patch b/4134.patch deleted file mode 100644 index 8f0b0d4..0000000 --- a/4134.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: ghc-8.10.4/docs/users_guide/conf.py -=================================================================== ---- ghc-8.10.4.orig/docs/users_guide/conf.py -+++ ghc-8.10.4/docs/users_guide/conf.py -@@ -42,9 +42,6 @@ nitpick_ignore = [ - - ("extension", "DoAndIfThenElse"), - ("extension", "RelaxedPolyRec"), -- -- # See #16629 -- ("extension", "UnliftedFFITypes"), - ] - - rst_prolog = """ -@@ -100,13 +97,13 @@ htmlhelp_basename = 'GHCUsersGuide' - latex_elements = { - 'inputenc': '', - 'utf8extra': '', -- 'preamble': ''' -+ 'preamble': r''' - \usepackage{fontspec} - \usepackage{makeidx} - \setsansfont{DejaVu Sans} - \setromanfont{DejaVu Serif} - \setmonofont{DejaVu Sans Mono} --\setlength{\\tymin}{45pt} -+\setlength{\tymin}{45pt} - ''', - } - -Index: ghc-8.10.4/docs/users_guide/expected-undocumented-flags.txt -=================================================================== ---- ghc-8.10.4.orig/docs/users_guide/expected-undocumented-flags.txt -+++ ghc-8.10.4/docs/users_guide/expected-undocumented-flags.txt -@@ -38,7 +38,6 @@ - -XAutoDeriveTypeable - -XDoAndIfThenElse - -XDoRec ---XGHCForeignImportPrim - -XGenerics - -XImplicitPrelude - -XJavaScriptFFI diff --git a/ghc-8.10.4-src.tar.xz b/ghc-8.10.4-src.tar.xz deleted file mode 100644 index c96f60a..0000000 --- a/ghc-8.10.4-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e -size 19818108 diff --git a/ghc-8.10.4-src.tar.xz.sig b/ghc-8.10.4-src.tar.xz.sig deleted file mode 100644 index 1eea072b087667a9c90db06aea9a47de268a5e9cb9608c2095c79ac20765bc83..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmV-Q0=4~#0!IV@0SEvw79j-x>wM@Q7NcuEE$weD;7v}K+hnZ;0$?4UND~}lWo|%s zWo&FMba`-PWG-WGZ2$@h5G~+MPM6zctzSS7|45__j}q*DYSOYn=*CD^LR26Afq=LQ zI5b=<=Y; zV$N4~FjA1-JYG3kv3*4gBBFZ?rE6ve$~6ny?8J+RXKds|D4u;{u#piil-`)xlBsFI zO6SE5?YM;hkrNhj?X|%nKEwXzI@JJ|Xs*p1Fh|GCH?Xt2ue&%}iaYt}Or@_g!nltp zsiH}*X0UP^MkfETnbwGafhMaP1SUL;Shq#O5eUW!Qt7O=9Wck-XAX-s22>gB=}UjJ z@*s#nQ8vygBjvRj7N%Ka{JG0pt8Q(&xssxqNj;oZd?D0=tn9B<<2ZQ^99uG&@hDNBDD z@jFr1WM|${w|c_p&X&!BB<0r9{Tf&0ss&52CWvTy`?PPI^@#(uAwvufhWrKnSqECuJTRsAcG5w zS4V!1`3(3u6@M~K&=ZKvG`)ZABu}Ds078oQ5`31jd2eIFs32N1H{nzgn@deFR4=e( z*0<_elze)3wz`!Qn7gcI!UiEeVfSwI#Z{<-R&ub@D-^C+6!xW1$5-0N4wo`3%9dyc zS6hEBIq7J1C9cc~%t>jicP>WbTk;e+zG9lRwS} [GeneralFlag] - default_PIC platform = - case (platformOS platform, platformArch platform) of - (OSDarwin, ArchX86_64) -> [Opt_PIC] -+ (OSLinux, ArchX86_64) -> [Opt_PIC] - (OSOpenBSD, ArchX86_64) -> [Opt_PIC] -- Due to PIE support in - -- OpenBSD since 5.3 release - -- (1 May 2013) we need to +--- ghc-8.10.7.orig/compiler/main/DynFlags.hs ++++ ghc-8.10.7/compiler/main/DynFlags.hs +@@ -4659,6 +4659,7 @@ default_PIC platform = + -- of that. Subsequently we expect all code on aarch64/linux (and macOS) to + -- be built with -fPIC. + -- See #15275, #18892 ++ (OSLinux, ArchX86_64) -> [Opt_PIC] + (OSDarwin, ArchAArch64) -> [Opt_PIC] + (OSLinux, ArchAArch64) -> [Opt_PIC, Opt_ExternalDynamicRefs] + (OSLinux, ArchARM {}) -> [Opt_PIC, Opt_ExternalDynamicRefs] diff --git a/ghc.changes b/ghc.changes index bd3383d..78c9884 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,45 @@ +---- --------------------------------------------------------------- +Fri Sep 3 20:57:29 UTC 2021 - Ondřej Súkup + +- update to 8.10.7 +- drop 4134.path and refresh ghc-pie.patch + * portabilit yfixes + * Export some RTS symbols required for static builds of GHC + * Fix LLVM version checking logic so it no longer complains + about supported LLVM versions. + * Fix some RTS crashes on Darwin due to mixing up the closure + sizes of the aarch64 and x86-64 backends. + * Fix a crash on the non-moving GC due to incorrect logic + for calculating the header size for array write barries + * Fix a bug in base leading to a high likelihood of space + leaks when using lazy bytestrings + * Fix some timer races in the RTS possibly manifesting in #18033 and #20132 + * Fix a number of bugs affecting the RTS m32 allocator + * Fix a bug where code may be unloaded prematurely + when using the parallel garbage collector + * Fix a bug where the linker may during shutdown unload code before + libraries’ atexit handlers have a chance to run + * Improve code layout by distiguishing conditional and unconditional branches + * Add hs-boot file support for -ddump-minimal-imports + * Ensure hs-boot files are built before source files in GHCs -M mode + * Fix a long standing GHC API bug affecting clients like HLS where + async exceptions used to cancel threads during typechecking would be + caught by the Template Haskell evaluator and reported as compile errors + * Improve error messages when looking up packages fails + * Fix a number of quirks in GC accounting + * Fix a code generation bug which could result in entry of unlifted + objects in some programs using unboxed sums + * Ensure that POSIX signals are not delivered to the ticker thread + when using the pthread itimer implementation. + * Fix a specialiser bug which could result in the construction + of recursive dictionaries in some programs + * Bump containers to 0.6.4.1 + * Do not treat -Winferred-safe-imports warnings as errors. + * Fix a bug where typechecker plugins could be run with + an inconsistent typechecker environment + * Fix a simplifier bug which lead to an exponential + blow up and excessive memory usage in certain cases + ------------------------------------------------------------------- Fri Jun 25 10:02:25 UTC 2021 - Ondřej Súkup diff --git a/ghc.spec b/ghc.spec index 36dd220..c449097 100644 --- a/ghc.spec +++ b/ghc.spec @@ -23,10 +23,10 @@ %endif %global unregisterised_archs s390 s390x riscv64 -%define full_version 8.10.4 +%define full_version 8.10.7 Name: ghc -Version: 8.10.4 +Version: 8.10.7 Release: 0 URL: https://www.haskell.org/ghc/ Source: https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz @@ -53,10 +53,10 @@ BuildRequires: xz %ifarch aarch64 %{arm} BuildRequires: binutils-gold %endif -%ifarch aarch64 %{arm} %{ix86} x86_64 -BuildRequires: clang9 -BuildRequires: llvm9 -BuildRequires: llvm9-devel +%ifarch aarch64 %{arm} +BuildRequires: clang >= 9 +BuildRequires: llvm >= 9 +BuildRequires: llvm-devel >= 9 %endif %if %{undefined without_manual} BuildRequires: python3-Sphinx @@ -80,8 +80,6 @@ Patch35: ghc-pie.patch Patch100: ghc-8.0.2-Cabal-dynlibdir.patch # PATCH-FIX-UPSTREAM buildpath-abi-stability.patch -- debian patch for more stable abi-1 Patch110: buildpath-abi-stability.patch -# PATCH-FIX-UPSTREAM 4134.diff -- documentation fiixes and sphinx4 build fix -Patch120: 4134.patch %description Haskell is the standard purely functional programming language; the @@ -139,10 +137,10 @@ To install all of GHC install package ghc. #!ForceMultiversion %ghc_lib_subpackage -d Cabal-3.2.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.14.1.0 +%ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-4.14.3.0 %ghc_lib_subpackage -d binary-0.8.8.0 %ghc_lib_subpackage -d bytestring-0.10.12.0 -%ghc_lib_subpackage -d containers-0.6.2.1 +%ghc_lib_subpackage -d containers-0.6.5.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 @@ -153,14 +151,14 @@ 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 haskeline-0.8.2 %ghc_lib_subpackage -d hpc-0.6.1.0 %ghc_lib_subpackage -d libiserv-%{ghc_version_override} %ghc_lib_subpackage -d mtl-2.2.2 %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.9.0 -%ghc_lib_subpackage -d stm-2.5.0.0 +%ghc_lib_subpackage -d process-1.6.13.2 +%ghc_lib_subpackage -d stm-2.5.0.1 %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.4.1 @@ -194,7 +192,6 @@ except the ghc library, which is installed by the toplevel ghc metapackage. %patch35 -p1 %patch100 -p1 %patch110 -p1 -%patch120 -p1 %build cat > mk/build.mk <