osc copypac from project:devel:languages:haskell:ghc-8.8.x package:ghc revision:14, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=316
This commit is contained in:
Peter Simons 2020-01-01 02:01:31 +00:00 committed by Git OBS Bridge
parent f4a50e35fb
commit e835413802
5 changed files with 23 additions and 15 deletions

View File

@ -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.8.1.orig/compiler/iface/MkIface.hs
+++ ghc-8.6.1/compiler/iface/MkIface.hs +++ ghc-8.8.1/compiler/iface/MkIface.hs
@@ -702,7 +702,7 @@ addFingerprints hsc_env mb_old_fingerpri @@ -713,7 +713,7 @@ addFingerprints hsc_env mb_old_fingerpri
iface_hash <- computeFingerprint putNameLiterally iface_hash <- computeFingerprint putNameLiterally
(mod_hash, (mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@ -11,7 +11,7 @@ Index: ghc-8.6.1/compiler/iface/MkIface.hs
sorted_deps, sorted_deps,
mi_hpc iface0) 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) (non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0 fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0) ann_fn = mkIfaceAnnCache (mi_anns iface0)

View File

@ -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.8.1.orig/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
+++ ghc-8.6.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs +++ ghc-8.8.1/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs
@@ -204,7 +204,7 @@ defaultInstallDirs' False comp userInsta @@ -205,7 +205,7 @@ defaultInstallDirs' False comp userInsta
_other -> "$abi" </> "$libname", _other -> "$abi" </> "$libname",
dynlibdir = "$libdir" </> case comp of dynlibdir = "$libdir" </> case comp of
UHC -> "$pkgid" UHC -> "$pkgid"

View File

@ -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.8.1.orig/compiler/main/DynFlags.hs
+++ ghc-8.6.1/compiler/main/DynFlags.hs +++ ghc-8.8.1/compiler/main/DynFlags.hs
@@ -4317,6 +4317,7 @@ default_PIC :: Platform -> [GeneralFlag] @@ -4511,6 +4511,7 @@ default_PIC :: Platform -> [GeneralFlag]
default_PIC platform = default_PIC platform =
case (platformOS platform, platformArch platform) of case (platformOS platform, platformArch platform) of
(OSDarwin, ArchX86_64) -> [Opt_PIC] (OSDarwin, ArchX86_64) -> [Opt_PIC]

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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> Sun Dec 29 13:10:39 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>

View File

@ -34,11 +34,11 @@ Release: 0
URL: https://www.haskell.org/ghc/ URL: https://www.haskell.org/ghc/
Source: https://downloads.haskell.org/~ghc/8.8.1/ghc-%{version}-src.tar.xz Source: https://downloads.haskell.org/~ghc/8.8.1/ghc-%{version}-src.tar.xz
Source1: https://downloads.haskell.org/~ghc/8.8.1/ghc-%{version}-src.tar.xz.sig Source1: https://downloads.haskell.org/~ghc/8.8.1/ghc-%{version}-src.tar.xz.sig
Summary: The Glorious Glasgow Haskell Compiler
Source2: ghc-rpmlintrc Source2: ghc-rpmlintrc
Summary: The Glorious Glasgow Haskell Compiler
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Languages/Other 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 ... # hard to port to PIE, some prebuilt static libraries are non-PIC ...
#!BuildIgnore: gcc-PIE #!BuildIgnore: gcc-PIE
BuildRequires: binutils-devel BuildRequires: binutils-devel