From 7e659e12aab83f5d4749edff5e965892c1433c60c4c54be8ecc59c1f3fbb10da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 10 Jun 2021 14:09:09 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc revision:44, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=359 --- ghc-8.10.4-src.tar.xz | 3 +++ ghc-8.10.4-src.tar.xz.sig | Bin 0 -> 586 bytes ghc-8.10.5-src.tar.xz | 3 --- ghc-8.10.5-src.tar.xz.sig | Bin 438 -> 0 bytes ghc-pie.patch | 20 ++++++++++---------- ghc.changes | 21 --------------------- ghc.spec | 26 +++++++++++++------------- 7 files changed, 26 insertions(+), 47 deletions(-) create mode 100644 ghc-8.10.4-src.tar.xz create mode 100644 ghc-8.10.4-src.tar.xz.sig delete mode 100644 ghc-8.10.5-src.tar.xz delete mode 100644 ghc-8.10.5-src.tar.xz.sig diff --git a/ghc-8.10.4-src.tar.xz b/ghc-8.10.4-src.tar.xz new file mode 100644 index 0000000..c96f60a --- /dev/null +++ b/ghc-8.10.4-src.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..1eea072b087667a9c90db06aea9a47de268a5e9cb9608c2095c79ac20765bc83 GIT binary patch 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`?PD|kPt0VCI!HH(3Ub9E28L6V;yC0EF}rsz@GM*ct+lLR zd*ARW4&2Drp8Y6j;fW*pG2X;qm!qCLW(R~$vGYy;qcY)NIKaO?hKBClv{HaUz=AV;&loal_2JdMNSONEo z3@jv>qjgc!vsEx3#`JONd#Zap{sv*+^z>&%q#tUGp~ z7Tb-%KuytKbaI@H3f`Sww2d0p;d3>(ohf(c{a=`5@Og%Z_QyTi23f`dO|^!O0ypou zP`uNvu&u}CQLb [Opt_PIC] +--- 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] + default_PIC platform = + case (platformOS platform, platformArch platform) of + (OSDarwin, ArchX86_64) -> [Opt_PIC] + (OSLinux, ArchX86_64) -> [Opt_PIC] - -- For AArch64, we need to always have PIC enabled. The relocation model - -- on AArch64 does not permit arbitrary relocations. Under ASLR, we can't - -- control much how far apart symbols are in memory for our in-memory static + (OSOpenBSD, ArchX86_64) -> [Opt_PIC] -- Due to PIE support in + -- OpenBSD since 5.3 release + -- (1 May 2013) we need to diff --git a/ghc.changes b/ghc.changes index 569c2ed..9e89194 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,24 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 8 10:46:50 UTC 2021 - Ondřej Súkup - -- 8.10.5 llvm backend needs llvm 10 - 12 - -------------------------------------------------------------------- -Sun Jun 6 19:38:14 UTC 2021 - Ondřej Súkup - -- update to 8.10.5 -- refresh ghc-pie.patch - * Fix a bug resulting in segmentation faults where code may be unloaded prematurely - when using the parallel garbage collector (#19417) along with other bugs - in the GC and linker (#19147, #19287) - * Improve code layout fixing certain performance regressions (#18053) - and other code generation bug fixes (#19645) - * Bug fixes for signal handling when using the pthread itimer implementation. - * Improvements to the specializer and simplifier reducing code size and and memory usage - * Fix a bug where typechecker plugins could be run with an inconsistent typechecker environmen - * Fix a simplifier bug which lead to an exponential blow up and excessive memory - usage in certain cases - ------------------------------------------------------------------- Mon Mar 15 20:33:24 UTC 2021 - Dirk Müller diff --git a/ghc.spec b/ghc.spec index f9c635a..fd81bad 100644 --- a/ghc.spec +++ b/ghc.spec @@ -23,10 +23,10 @@ %endif %global unregisterised_archs s390 s390x riscv64 -%define full_version 8.10.5 +%define full_version 8.10.4 Name: ghc -Version: 8.10.5 +Version: 8.10.4 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} -BuildRequires: clang10 -BuildRequires: llvm10 -BuildRequires: llvm10-devel +%ifarch aarch64 %{arm} %{ix86} x86_64 +BuildRequires: clang9 +BuildRequires: llvm9 +BuildRequires: llvm9-devel %endif %if %{undefined without_manual} BuildRequires: python3-Sphinx @@ -109,12 +109,12 @@ Requires(postun): update-alternatives Requires: binutils-gold %endif %ifarch aarch64 %{arm} -Requires: clang10 -Requires: llvm10 +Requires: clang9 +Requires: llvm9 %endif %ifarch x86_64 %{ix86} -Suggests: clang10 -Suggests: llvm10 +Suggests: clang9 +Suggests: llvm9 %endif %description compiler @@ -137,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.2.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.12.0 -%ghc_lib_subpackage -d containers-0.6.4.1 +%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.6.0 %ghc_lib_subpackage -d exceptions-0.10.4 @@ -158,7 +158,7 @@ To install all of GHC install package ghc. %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.1 +%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.4.1