From ded4edf9bc98ada0ee662105d14ce9327afa24c207e9f285ec72b3f9f7800d8a Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Tue, 5 Jun 2018 13:10:29 +0000
Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.4.x
 package:ghc revision:4, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=266
---
 ghc-8.4.2-src.tar.xz |  3 ---
 ghc-8.4.3-src.tar.xz |  3 +++
 ghc.changes          | 15 +++++++++++
 ghc.spec             | 60 +++++++++++---------------------------------
 4 files changed, 33 insertions(+), 48 deletions(-)
 delete mode 100644 ghc-8.4.2-src.tar.xz
 create mode 100644 ghc-8.4.3-src.tar.xz

diff --git a/ghc-8.4.2-src.tar.xz b/ghc-8.4.2-src.tar.xz
deleted file mode 100644
index 9b23a45..0000000
--- a/ghc-8.4.2-src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01cc32f24a06bf3b2428351b6d7fec791e82d042426d29ad9e5a245b35f0047b
-size 11313140
diff --git a/ghc-8.4.3-src.tar.xz b/ghc-8.4.3-src.tar.xz
new file mode 100644
index 0000000..d76c591
--- /dev/null
+++ b/ghc-8.4.3-src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6
+size 11315068
diff --git a/ghc.changes b/ghc.changes
index 74a513a..bebacaa 100644
--- a/ghc.changes
+++ b/ghc.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jun  1 13:13:27 UTC 2018 - ptrommler@icloud.com
+
+- update to 8.4.3
+* code generation for UnboxedSum fixed
+* compatibility withe newer binutils (as)
+* Cabal issue with abi-depends fixed 
+
+-------------------------------------------------------------------
+Sun May 27 17:17:36 UTC 2018 - ptrommler@icloud.com
+
+- Fix build for older openSUSE
+- Don't do selfbootstrapping
+* Cuts down build time roughly in half 
+
 -------------------------------------------------------------------
 Fri May 18 06:37:11 UTC 2018 - guillaume.gardet@opensuse.org
 
diff --git a/ghc.spec b/ghc.spec
index 28d9681..ec60623 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -29,7 +29,7 @@
 %global unregisterised_archs s390 s390x
 
 Name:           ghc
-Version:        8.4.2
+Version:        8.4.3
 Release:        0
 Url:            http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
 Summary:        The Glorious Glasgow Haskell Compiler
@@ -60,7 +60,11 @@ BuildRequires:  xz
 BuildRequires:  binutils-gold
 %endif
 %ifarch aarch64 %{arm} %{ix86} x86_64
+%if %{suse_version} >= 1500
 BuildRequires:  llvm5-devel
+%else
+BuildRequires:  llvm-devel
+%endif
 %endif
 %if %{undefined without_manual}
 BuildRequires:  python-sphinx
@@ -115,11 +119,10 @@ Requires(postun): update-alternatives
 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
+%if 0%{?suse_version} >= 1500
 Requires:       llvm5
+%else
+Requires:       llvm
 %endif
 %endif
 
@@ -194,46 +197,6 @@ except the ghc library, which is installed by the toplevel ghc metapackage.
 # Probably fixed upstream
 
 %build
-# Check if bootstrap is required, i.e. version is different from ghc's version
-# Note: Cannot use ghc_version macro here as we defined version override earlier
-%if "%version" != "%(ghc --numeric-version)"
-%define ghc_boot 1
-cat > mk/build.mk <<EOF
-GhcLibWays = v %{!?ghc_without_shared:dyn}
-%if %{defined ghc_without_shared}
-DYNAMIC_BY_DEFAULT   = NO
-DYNAMIC_GHC_PROGRAMS = NO
-%endif
-%ifarch %{unregisterised_archs}
-GhcUnregisterised    = YES
-GhcWithNativeCodeGen = NO
-GhcWithInterpreter   = YES
-SRC_HC_OPTS          = -O -H64m
-GhcStage1HcOpts      = -O
-GhcStage2HcOpts      = -O
-GhcHcOpts            = -Rghc-timing
-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
-BUILD_SPHINX_PS      = NO
-BUILD_SPHINX_PDF     = NO
-HSCOLOUR_SRCS        = NO
-EOF
-./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi
-%ifnarch aarch64 %{arm} s390 s390x
-make %{?_smp_mflags}
-%else
-make -j 2
-%endif
-make install
-make clean
-%endif
-
 cat > mk/build.mk <<EOF
 %ifarch aarch64 %{arm}
 BuildFlavour = perf-llvm
@@ -341,7 +304,9 @@ for i in hsc2hs runhaskell; do
   touch %{buildroot}%{_sysconfdir}/alternatives/$i
 done
 
+%if 0%{?suse_version} <= 1320
 %ghc_strip_dynlinked
+%endif
 
 find %{buildroot}%{ghclibdocdir} -name LICENSE -exec rm '{}' ';'
 
@@ -465,6 +430,11 @@ fi
 %ghost %{ghcdocbasedir}/libraries/minus.gif
 %ghost %{ghcdocbasedir}/libraries/plus.gif
 %endif
+# With 1.7.4 of ghc-rpm-macros license files are installed here
+# but rpm does not own this directory on older openSUSE.
+%if 0%{?suse_version} <= 1320
+%dir %{_datadir}/licenses
+%endif
 
 %files libraries
 %license LICENSE