Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2018-05-30 11:53:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc" Wed May 30 11:53:01 2018 rev:59 rq:607733 version:8.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-10-19 19:32:38.903440142 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-05-30 12:22:23.719721690 +0200 @@ -1,0 +2,71 @@ +Thu Apr 26 19:51:11 UTC 2018 - ptromm...@icloud.com + +- update to 8.4.2 +- drop 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch +* fixed upstream +- drop 0001-PPC-Implement-Atomic-operations.patch +* fixed upstream +- drop 0001-Use-__atomic-intrinsics-for-atomicread-write.patch +* fixed upstream +- drop D4089.patch +* fixed upstream + +------------------------------------------------------------------- +Thu Apr 26 12:21:57 UTC 2018 - mimi...@gmail.com + +- fix BuildRequires for llvm + +------------------------------------------------------------------- +Wed Apr 18 07:42:06 UTC 2018 - mimi...@gmail.com + +- use %license macro as used by new ghc-rpm-macros + +------------------------------------------------------------------- +Mon Dec 18 18:16:10 UTC 2017 - ptromm...@icloud.com + +- refresh ghc-pie.patch so it applies cleanly + +------------------------------------------------------------------- +Sat Dec 16 20:53:37 UTC 2017 - mimi...@gmail.com + +- reintroduce ghc-pie.patch (pure upstreams don't work) + +------------------------------------------------------------------- +Sat Dec 9 16:27:31 UTC 2017 - ptromm...@icloud.com + +- update to 8.2.2 +- Several important correctness issues fixing potential runtime crashes +- A correctness issue leading to undefined behavior in some programs + making use of STMa fixed +- A runtime system bug which may have manifested as a segmentation fault + under low-memory conditions fixed +- ghc-pkg now works correctly ihn environments with misconfigured NFS mounts +- GHC can now produce position-independent executables +- Significantly improved type errors +- refresh reproducible-tmp-names.patch +- drop ghc-pie.patch fixed upstream + +------------------------------------------------------------------- +Tue Oct 31 18:41:52 UTC 2017 - ptromm...@icloud.com + +- update to 8.2.1 +- improved compiler performance +- reliable DWARF debugging information on x86_64 and i386 +- aarch64: registerised through LLVM backend (experimental) +- optimized build for platforms with LLVM backend (arm, aarch64) +- improved performance on NUMA systems +- interface file determinism +- various language improvements +- update _constraints + * ppc64le builds need less memory since 8.2.1 +- drop support for ppc and s390 +- drop ghc-no-madv-free.patch fixed upstream +- drop 0001-StgCmmPrim-Add-missing-write-barrier.patch +- refresh buildpath-abi-stability.patch +- refresh ghc-8.0.2-Cabal-dynlibdir.patch +- refresh ghc-pie.patch +- refresh reproducible-tmp-names.patch +- refresh 0001-PPC-Implement-Atomic-operations.patch +- refresh D4089.patch + +------------------------------------------------------------------- @@ -30 +101 @@ -- make compactible with new upstream macros +- make compatible with new upstream macros Old: ---- 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch 0001-PPC-Implement-Atomic-operations.patch 0001-StgCmmPrim-Add-missing-write-barrier.patch 0001-Use-__atomic-intrinsics-for-atomicread-write.patch D4089.patch ghc-8.0.2-src.tar.xz ghc-no-madv-free.patch New: ---- ghc-8.4.2-src.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.Lqy7g4/_old 2018-05-30 12:22:24.895687764 +0200 +++ /var/tmp/diff_new_pack.Lqy7g4/_new 2018-05-30 12:22:24.899687649 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,21 +20,27 @@ %define without_manual 1 %endif -%global unregisterised_archs aarch64 s390 s390x +%ifnarch %{arm} s390x +%define with_libnuma 1 +%else +%define with_libnuma 0 +%endif + +%global unregisterised_archs s390 s390x Name: ghc -Version: 8.0.2 +Version: 8.4.2 Release: 0 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 %{ix86} x86_64 ppc ppc64 ppc64le s390 s390x +ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc64 ppc64le s390x # hard to port to PIE, some prebuilt static libraries are non-PIC ... #!BuildIgnore: gcc-PIE BuildRequires: binutils-devel BuildRequires: gcc -BuildRequires: ghc-bootstrap >= 7.8 +BuildRequires: ghc-bootstrap >= 8.0 BuildRequires: ghc-rpm-macros-extra BuildRequires: glibc-devel BuildRequires: gmp-devel @@ -46,49 +52,38 @@ %else BuildRequires: libffi-devel %endif -%ifarch aarch64 -BuildRequires: binutils-gold -%endif -#TODO ghc-8.0.1 supports only llvm-3.7, need talk with llvm packagers about -# versioned build of llvm -# Currently, there is no llvm support for powerpc* in GHC. -# Aarch64 has unregisterised LLVM backend, we need llvm 3.7.x -#%%ifarch aarch64 %{ix86} x86_64 -#BuildRequires: llvm -#%%endif +BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: pkg-config BuildRequires: xz +%ifarch aarch64 %{arm} +BuildRequires: binutils-gold +%endif +%ifarch aarch64 %{arm} %{ix86} x86_64 +BuildRequires: llvm5-devel +%endif %if %{undefined without_manual} BuildRequires: python-sphinx %endif +%if %with_libnuma +BuildRequires: libnuma-devel +%endif + 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-StgCmmPrim-Add-missing-write-barrier.patch peter.tromm...@ohm-hochschule.de -- Add missing write barrier on mutable arrays. -Patch28: 0001-StgCmmPrim-Add-missing-write-barrier.patch -# PATCH-FIX_UPSTREAM ghc-no-madv-free.patch peter.tromm...@ohn-hochschule.de -- Fix "unable to decommit memory: Invalid argument" errors. See Haskell Trac #12865 for details. -Patch29: ghc-no-madv-free.patch -# PATCH-FIX-UPSTREAM 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch peter.tromm...@ohm-hochschule.de -- Fix PPC codegen: Fixes ghc-zeromq4-haskell build on 64-bit PowerPCs -Patch30: 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch -Patch31: ghc-pie.patch -# PATCH-FIX-UPSTREAM 0001-PPC-Implement-Atomic-operations.patch ptromm...@icloud.com -- Inline atomic operations for PowerPC. -Patch32: 0001-PPC-Implement-Atomic-operations.patch -# PATCH-FIX-UPSTREAM 0001-Use-__atomic-intrinsics-for-atomicread-write.patch ptromm...@icloud.com -- Fix atomic read and atomic write on platforms that have no native code generator nor LLVM backend. This is s390x for openSUSE. See Haskell Trac #14244. -Patch33: 0001-Use-__atomic-intrinsics-for-atomicread-write.patch -# PATCH-FIX-UPSTREAM D4089.patch ptromm...@icloud.com -- Fix GHCi on ppc64. See Haskell Trac #11262 -Patch34: D4089.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. 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 reproducible-tmp-names.patch -- debian patch for more stable abi-2 Patch111: reproducible-tmp-names.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Haskell is the standard purely functional programming language; the @@ -114,9 +109,17 @@ Requires: ghc-base-devel Requires(post): update-alternatives Requires(postun): update-alternatives -%ifarch aarch64 +%ifarch aarch64 %{arm} Requires: binutils-gold %endif +%ifarch aarch64 %{arm} %{ix86} x86_64 +# Leap:15 + SLE15 now have wrong metapackage +%if 0%{?suse_version} >= 1550 || 0%{?suse_version} == 1315 +Requires: llvm +%else +Requires: llvm5 +%endif +%endif %description compiler This package contains the GHC compiler, tools and utilities. @@ -128,31 +131,39 @@ %global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release} +%if %with_libnuma +%define libnuma_dep ,libnuma-devel +%endif + %if %{defined ghclibdir} -%ghc_lib_subpackage -d Cabal-1.24.2.0 -%ghc_lib_subpackage -d array-0.5.1.1 -%ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel base-4.9.1.0 -%ghc_lib_subpackage -d binary-0.8.3.0 -%ghc_lib_subpackage -d bytestring-0.10.8.1 -%ghc_lib_subpackage -d containers-0.5.7.1 -%ghc_lib_subpackage -d deepseq-1.4.2.0 -%ghc_lib_subpackage -d directory-1.3.0.0 -%ghc_lib_subpackage -d filepath-1.4.1.1 +%ghc_lib_subpackage -d Cabal-2.2.0.1 +%ghc_lib_subpackage -d array-0.5.2.0 +%ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-4.11.1.0 +%ghc_lib_subpackage -d binary-0.8.5.1 +%ghc_lib_subpackage -d bytestring-0.10.8.2 +%ghc_lib_subpackage -d containers-0.5.11.0 +%ghc_lib_subpackage -d deepseq-1.4.3.0 +%ghc_lib_subpackage -d directory-1.3.1.5 +%ghc_lib_subpackage -d filepath-1.4.2 %ghc_lib_subpackage -d -x ghc-%{ghc_version_override} %ghc_lib_subpackage -d ghc-boot-%{ghc_version_override} %ghc_lib_subpackage -d ghc-boot-th-%{ghc_version_override} +%ghc_lib_subpackage -d ghc-compact-0.1.0.0 %ghc_lib_subpackage -d -x ghci-%{ghc_version_override} -%ghc_lib_subpackage -d haskeline-0.7.3.0 -%ghc_lib_subpackage -d hoopl-3.10.2.1 +%ghc_lib_subpackage -d haskeline-0.7.4.2 %ghc_lib_subpackage -d hpc-0.6.0.3 -%ghc_lib_subpackage -d pretty-1.1.3.3 -%ghc_lib_subpackage -d process-1.4.3.0 -%ghc_lib_subpackage -d template-haskell-2.11.1.0 -%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.0.2 -%ghc_lib_subpackage -d time-1.6.0.1 -%ghc_lib_subpackage -d transformers-0.5.2.0 -%ghc_lib_subpackage -d unix-2.7.2.1 -%ghc_lib_subpackage -d xhtml-3000.2.1 +%ghc_lib_subpackage -d mtl-2.2.2 +%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.3.0 +%ghc_lib_subpackage -d stm-2.4.5.0 +%ghc_lib_subpackage -d template-haskell-2.13.0.0 +%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.1 +%ghc_lib_subpackage -d text-1.2.3.0 +%ghc_lib_subpackage -d time-1.8.0.2 +%ghc_lib_subpackage -d transformers-0.5.5.0 +%ghc_lib_subpackage -d unix-2.7.2.2 +%ghc_lib_subpackage -d xhtml-3000.2.2.1 %endif %global version %{ghc_version_override} @@ -173,16 +184,11 @@ %prep %setup -q -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 +%patch35 -p1 %patch100 -p1 %patch110 -p1 -%patch111 -p1 +#%%patch111 -p1 +# Probably fixed upstream %build # Check if bootstrap is required, i.e. version is different from ghc's version @@ -206,6 +212,8 @@ GhcLibHcOpts = -O SRC_HC_OPTS += -optc-fno-builtin SRC_CC_OPTS += -fno-builtin +SRC_HC_OPTS += -optc-Wno-return-type +SRC_CC_OPTS += -Wno-return-type %endif HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO @@ -214,7 +222,7 @@ HSCOLOUR_SRCS = NO EOF ./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi -%ifnarch aarch64 s390 s390x +%ifnarch aarch64 %{arm} s390 s390x make %{?_smp_mflags} %else make -j 2 @@ -224,7 +232,9 @@ %endif cat > mk/build.mk <<EOF -%ifnarch %{unregisterised_archs} +%ifarch aarch64 %{arm} +BuildFlavour = perf-llvm +%else BuildFlavour = perf %endif EOF @@ -271,14 +281,16 @@ %{?ghc_boot:--with-ghc=%{_builddir}/ghc-boot/bin/ghc} \ --with-system-libffi -%ifnarch aarch64 s390 s390x +%ifnarch aarch64 %{arm} s390 s390x make %{?_smp_mflags} %else make -j 2 %endif %install -#%%ghc_suse_disable_debug_packages +%if 0%{?suse_version} <= 1320 +%ghc_suse_disable_debug_packages +%endif %makeinstall for i in %{ghc_packages_list}; do @@ -293,8 +305,8 @@ %ghc_gen_filelists ghc %{ghc_version_override} %ghc_gen_filelists ghci %{ghc_version_override} -%ghc_gen_filelists ghc-prim 0.5.0.0 -%ghc_gen_filelists integer-gmp 1.0.0.1 +%ghc_gen_filelists ghc-prim 0.5.2.0 +%ghc_gen_filelists integer-gmp 1.0.2.0 %define merge_filelist()\ cat ghc-%1.files >> ghc-%2.files\ @@ -375,12 +387,11 @@ fi %files -%defattr(-,root,root,-) -%doc LICENSE +%license LICENSE %files compiler -%defattr(-,root,root,-) -%doc ANNOUNCE LICENSE +%license LICENSE +%doc ANNOUNCE %{_bindir}/ghc %{_bindir}/ghc-%{version} %{_bindir}/ghc-pkg @@ -405,6 +416,7 @@ %{ghclibdir}/bin/ghc-iserv %{ghclibdir}/bin/ghc-iserv-dyn %{ghclibdir}/bin/ghc-iserv-prof +%{ghclibdir}/bin/hp2ps %{ghclibdir}/bin/hpc %{ghclibdir}/bin/hsc2hs %ifnarch %{unregisterised_archs} @@ -414,6 +426,7 @@ %{ghclibdir}/ghci-usage.txt %dir %{ghclibdir}/package.conf.d %ghost %{ghclibdir}/package.conf.d/package.cache +%ghost %{ghclibdir}/package.conf.d/package.cache.lock %{ghclibdir}/platformConstants %{ghclibdir}/bin/runghc %{ghclibdir}/template-hsc.h @@ -429,6 +442,7 @@ %{_bindir}/haddock-ghc-%{version} %{ghclibdir}/html %{ghclibdir}/latex +%{ghclibdir}/llvm-targets %{ghclibdir}/bin/haddock %if %{undefined without_manual} %{ghcdocbasedir}/haddock @@ -437,10 +451,12 @@ %{ghcdocbasedir}/libraries/gen_contents_index %{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 %ghost %{ghcdocbasedir}/libraries/doc-index*.html +%ghost %{ghcdocbasedir}/libraries/haddock-bundle.min.js %ghost %{ghcdocbasedir}/libraries/haddock-util.js %ghost %{ghcdocbasedir}/libraries/index*.html %ghost %{ghcdocbasedir}/libraries/minus.gif @@ -448,7 +464,6 @@ %endif %files libraries -%defattr(-,root,root,-) -%doc LICENSE +%license LICENSE %changelog ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.Lqy7g4/_old 2018-05-30 12:22:24.939686495 +0200 +++ /var/tmp/diff_new_pack.Lqy7g4/_new 2018-05-30 12:22:24.939686495 +0200 @@ -7,14 +7,4 @@ <size unit="G">4</size> </physicalmemory> </hardware> - <overwrite> - <conditions> - <arch>ppc64le</arch> - </conditions> - <hardware> - <memory> - <size unit="G">8</size> - </memory> - </hardware> - </overwrite> </constraints> ++++++ buildpath-abi-stability.patch ++++++ --- /var/tmp/diff_new_pack.Lqy7g4/_old 2018-05-30 12:22:24.959685918 +0200 +++ /var/tmp/diff_new_pack.Lqy7g4/_new 2018-05-30 12:22:24.963685803 +0200 @@ -1,8 +1,8 @@ -Index: ghc-8.0.2/compiler/iface/MkIface.hs +Index: ghc-8.4.0.20171214/compiler/iface/MkIface.hs =================================================================== ---- ghc-8.0.2.orig/compiler/iface/MkIface.hs -+++ ghc-8.0.2/compiler/iface/MkIface.hs -@@ -556,7 +556,7 @@ addFingerprints hsc_env mb_old_fingerpri +--- ghc-8.4.0.20171214.orig/compiler/iface/MkIface.hs ++++ ghc-8.4.0.20171214/compiler/iface/MkIface.hs +@@ -689,7 +689,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) -@@ -589,6 +589,9 @@ addFingerprints hsc_env mb_old_fingerpri +@@ -724,6 +724,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) @@ -19,5 +19,5 @@ + usages = [ case u of UsageFile _ fp -> UsageFile "" fp; _ -> u | u <- mi_usages iface0 ] + - getOrphanHashes :: HscEnv -> [Module] -> IO [Fingerprint] - getOrphanHashes hsc_env mods = do + -- | Retrieve the orphan hashes 'mi_orphan_hash' for a list of modules + -- (in particular, the orphan modules which are transitively imported by the ++++++ ghc-8.0.2-Cabal-dynlibdir.patch ++++++ --- /var/tmp/diff_new_pack.Lqy7g4/_old 2018-05-30 12:22:24.975685456 +0200 +++ /var/tmp/diff_new_pack.Lqy7g4/_new 2018-05-30 12:22:24.975685456 +0200 @@ -1,11 +1,13 @@ ---- ghc-8.0.1.20161117/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs~ 2016-11-18 07:08:46.000000000 +0900 -+++ ghc-8.0.1.20161117/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs 2016-12-07 18:19:02.670468156 +0900 -@@ -186,7 +186,7 @@ +Index: ghc-8.4.0.20180204/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs +=================================================================== +--- ghc-8.4.0.20180204.orig/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs ++++ ghc-8.4.0.20180204/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs +@@ -205,7 +205,7 @@ defaultInstallDirs' False comp userInsta JHC -> "$compiler" LHC -> "$compiler" UHC -> "$pkgid" - _other -> "$abi", -+ _other -> "$compiler/$pkgkey", ++ _other -> "$compiler" </> "$pkgkey", + libexecsubdir= "$abi" </> "$pkgid", + flibdir = "$libdir", libexecdir = case buildOS of - Windows -> "$prefix" </> "$libname" - _other -> "$prefix" </> "libexec", ++++++ ghc-8.0.2-src.tar.xz -> ghc-8.4.2-src.tar.xz ++++++ /work/SRC/openSUSE:Factory/ghc/ghc-8.0.2-src.tar.xz /work/SRC/openSUSE:Factory/.ghc.new/ghc-8.4.2-src.tar.xz differ: char 25, line 1 ++++++ ghc-pie.patch ++++++ --- /var/tmp/diff_new_pack.Lqy7g4/_old 2018-05-30 12:22:25.007684533 +0200 +++ /var/tmp/diff_new_pack.Lqy7g4/_new 2018-05-30 12:22:25.007684533 +0200 @@ -1,8 +1,8 @@ -Index: ghc-8.0.2/compiler/main/DynFlags.hs +Index: ghc-8.4.0.20180204/compiler/main/DynFlags.hs =================================================================== ---- ghc-8.0.2.orig/compiler/main/DynFlags.hs -+++ ghc-8.0.2/compiler/main/DynFlags.hs -@@ -3650,6 +3650,7 @@ default_PIC :: Platform -> [GeneralFlag] +--- ghc-8.4.0.20180204.orig/compiler/main/DynFlags.hs ++++ ghc-8.4.0.20180204/compiler/main/DynFlags.hs +@@ -4155,6 +4155,7 @@ default_PIC :: Platform -> [GeneralFlag] default_PIC platform = case (platformOS platform, platformArch platform) of (OSDarwin, ArchX86_64) -> [Opt_PIC] ++++++ reproducible-tmp-names.patch ++++++ --- /var/tmp/diff_new_pack.Lqy7g4/_old 2018-05-30 12:22:25.043683493 +0200 +++ /var/tmp/diff_new_pack.Lqy7g4/_new 2018-05-30 12:22:25.043683493 +0200 @@ -4,11 +4,11 @@ Instead of using the process id, create a hash from the command line arguments, and assume that is going to be unique. -Index: ghc-8.0.2/compiler/main/SysTools.hs +Index: ghc-8.2.1.20170929/compiler/main/SysTools.hs =================================================================== ---- ghc-8.0.2.orig/compiler/main/SysTools.hs -+++ ghc-8.0.2/compiler/main/SysTools.hs -@@ -65,6 +65,7 @@ +--- ghc-8.2.1.20170929.orig/compiler/main/SysTools.hs ++++ ghc-8.2.1.20170929/compiler/main/SysTools.hs +@@ -68,6 +68,7 @@ import Platform import Util import DynFlags import Exception @@ -16,7 +16,7 @@ import LlvmCodeGen.Base (llvmVersionStr, supportedLlvmVersion) -@@ -1145,8 +1146,8 @@ +@@ -1121,8 +1122,8 @@ getTempDir dflags = do mapping <- readIORef dir_ref case Map.lookup tmp_dir mapping of Nothing -> do @@ -27,7 +27,7 @@ mask_ $ mkTempDir prefix Just dir -> return dir where -@@ -1562,6 +1563,13 @@ +@@ -1558,6 +1559,13 @@ getProcessID :: IO Int getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral #endif