From e835413802ed5fe25d06276aeb50095a6696eccf31b7f2225beaea89bde7478d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Jan 2020 02:01:31 +0000 Subject: [PATCH] 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 --- buildpath-abi-stability.patch | 10 +++++----- ghc-8.0.2-Cabal-dynlibdir.patch | 8 ++++---- ghc-pie.patch | 8 ++++---- ghc.changes | 8 ++++++++ ghc.spec | 4 ++-- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/buildpath-abi-stability.patch b/buildpath-abi-stability.patch index 89fe680..3e64079 100644 --- a/buildpath-abi-stability.patch +++ b/buildpath-abi-stability.patch @@ -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 @@ Index: ghc-8.6.1/compiler/iface/MkIface.hs 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) diff --git a/ghc-8.0.2-Cabal-dynlibdir.patch b/ghc-8.0.2-Cabal-dynlibdir.patch index 3b0884c..1f1cce6 100644 --- a/ghc-8.0.2-Cabal-dynlibdir.patch +++ b/ghc-8.0.2-Cabal-dynlibdir.patch @@ -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" diff --git a/ghc-pie.patch b/ghc-pie.patch index dab99f1..d077cec 100644 --- a/ghc-pie.patch +++ b/ghc-pie.patch @@ -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] diff --git a/ghc.changes b/ghc.changes index 577206e..07e81f3 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 30 12:08:41 UTC 2019 - Peter Trommler + +- 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 diff --git a/ghc.spec b/ghc.spec index 15825e8..5924920 100644 --- a/ghc.spec +++ b/ghc.spec @@ -34,11 +34,11 @@ Release: 0 URL: https://www.haskell.org/ghc/ 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 -Summary: The Glorious Glasgow Haskell Compiler 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