commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-10-23 15:13:19
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.3463 (New)
Package is "ghc"
Fri Oct 23 15:13:19 2020 rev:88 rq:842735 version:8.10.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-10-05 19:41:02.145663884
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new.3463/ghc.changes2020-10-23
15:13:24.222106918 +0200
@@ -1,0 +2,5 @@
+Wed Oct 14 12:20:00 UTC 2020 - Ondřej Súkup
+
+- force multiversion for subpackages
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.e4gn9m/_old 2020-10-23 15:13:25.302107439 +0200
+++ /var/tmp/diff_new_pack.e4gn9m/_new 2020-10-23 15:13:25.306107441 +0200
@@ -152,6 +152,7 @@
%endif
%if %{defined ghclibdir}
+#!ForceMultiversion
%ghc_lib_subpackage -d Cabal-3.2.0.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.1.0
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-10-05 19:40:12
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.4249 (New)
Package is "ghc"
Mon Oct 5 19:40:12 2020 rev:87 rq:839358 version:8.10.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-08-18 12:24:14.631802383
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new.4249/ghc.changes2020-10-05
19:41:02.145663884 +0200
@@ -1,0 +2,6 @@
+Sat Oct 3 15:58:52 UTC 2020 - Ondřej Súkup
+
+- add --enable-unregistered to configure phase on unregistered
+ architectures
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.xyvFfE/_old 2020-10-05 19:41:03.137664854 +0200
+++ /var/tmp/diff_new_pack.xyvFfE/_new 2020-10-05 19:41:03.141664857 +0200
@@ -55,9 +55,11 @@
%endif
%ifarch aarch64 %{arm} %{ix86} x86_64
%if 0%{?suse_version} >= 1550
+BuildRequires: llvm9
BuildRequires: llvm9-devel
BuildRequires: clang9
%else
+BuildRequires: llvm
BuildRequires: llvm-devel
BuildRequires: clang
%endif
@@ -257,6 +259,9 @@
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
+%ifarch %{unregisterised_archs}
+ --enable-unregisterised \
+%endif
--with-system-libffi
%if 0%{?suse_version} >= 1500
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-08-18 12:24:11
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.3399 (New)
Package is "ghc"
Tue Aug 18 12:24:11 2020 rev:86 rq:825369 version:8.10.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-06-05 20:24:15.104664405
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new.3399/ghc.changes2020-08-18
12:24:14.631802383 +0200
@@ -1,0 +2,15 @@
+Sun Aug 9 11:27:32 UTC 2020 - Ondřej Súkup
+
+- update to 8.10.2
+ * Fixes a code generation bug resulting in incorrect code generation
+for foreign calls with complex arguments
+ * Fixes a bug causing object merging to fail when the lld linker is in use
+ * Introduces a workaround for a Linux kernel bug in the implementation
+of the timerfd mechanism
+ * Fixes a few specialiser regressions as well introduces a variety
+of miscellaneous specialiser improvements
+ * Fixes a potential loss of sharing due to left operator sections
+ * Fix bootstrapping of GHC with the LLVM backend on x86-64
+ * few important correctness fixes for the low-latency garbage collector.
+
+---
Old:
ghc-8.10.1-src.tar.xz
ghc-8.10.1-src.tar.xz.sig
New:
ghc-8.10.2-src.tar.xz
ghc-8.10.2-src.tar.xz.sig
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.YtZGZR/_old 2020-08-18 12:24:17.075803402 +0200
+++ /var/tmp/diff_new_pack.YtZGZR/_new 2020-08-18 12:24:17.075803402 +0200
@@ -23,10 +23,10 @@
%endif
%global unregisterised_archs s390 s390x riscv64
-%define full_version 8.10.1
+%define full_version 8.10.2
Name: ghc
-Version:8.10.1
+Version:8.10.2
Release:0
URL:https://www.haskell.org/ghc/
Source:
https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz
@@ -152,7 +152,7 @@
%if %{defined ghclibdir}
%ghc_lib_subpackage -d Cabal-3.2.0.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.0.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.10.0
%ghc_lib_subpackage -d containers-0.6.2.1
@@ -166,13 +166,13 @@
%ghc_lib_subpackage -d ghc-compact-0.1.0.0
%ghc_lib_subpackage -d ghc-heap-%{ghc_version_override}
%ghc_lib_subpackage -d -x ghci-%{ghc_version_override}
-%ghc_lib_subpackage -d haskeline-0.8.0.0
+%ghc_lib_subpackage -d haskeline-0.8.0.1
%ghc_lib_subpackage -d hpc-0.6.1.0
%ghc_lib_subpackage -d libiserv-%{ghc_version_override}
%ghc_lib_subpackage -d mtl-2.2.2
%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.8.2
+%ghc_lib_subpackage -d process-1.6.9.0
%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-8.10.1-src.tar.xz -> ghc-8.10.2-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-8.10.1-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new.3399/ghc-8.10.2-src.tar.xz differ: char 25,
line 1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-06-05 20:18:01
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.3606 (New)
Package is "ghc"
Fri Jun 5 20:18:01 2020 rev:85 rq:811492 version:8.10.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-05-11 13:37:28.952630673
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new.3606/ghc.changes2020-06-05
20:24:15.104664405 +0200
@@ -1,0 +2,7 @@
+Sun May 31 18:47:18 UTC 2020 - Ondřej Súkup
+
+- cleanup specfile from Leap 42 and older remrants
+- drop fix-unregisterised-v8.4-8.6.patch
+- drop fix-build-using-unregisterized-v8.4.patch
+
+---
Old:
fix-build-using-unregisterized-v8.4.patch
fix-unregisterised-v8.4-8.6.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.9h7m56/_old 2020-06-05 20:24:17.488668659 +0200
+++ /var/tmp/diff_new_pack.9h7m56/_new 2020-06-05 20:24:17.488668659 +0200
@@ -16,10 +16,6 @@
#
-%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
-%define without_manual 1
-%endif
-
%ifnarch %{arm} s390x
%define with_libnuma 1
%else
@@ -40,8 +36,6 @@
License:BSD-3-Clause
Group: Development/Languages/Other
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
BuildRequires: gcc
BuildRequires: ghc-bootstrap >= 8.6
@@ -50,17 +44,9 @@
BuildRequires: gmp-devel
BuildRequires: libdw-devel
BuildRequires: libelf-devel
-#Fix for openSUSE:Leap:42.1
-%if 0%{?suse_version} == 1315
-BuildRequires: libffi48-devel
-%else
BuildRequires: libffi-devel
-%endif
BuildRequires: libtool
-# not resolvable on ppc
-%if 0%{?suse_version} >= 1500
BuildRequires: memory-constraints
-%endif
BuildRequires: ncurses-devel
BuildRequires: pkg-config
BuildRequires: xz
@@ -84,27 +70,16 @@
BuildRequires: libnuma-devel
%endif
-# for patch 1
-# BuildRequires: python3
-# bogus requires
-%ifarch x86_64
BuildRequires: ghc-bootstrap-helpers
-%else
-BuildRequires: alex
-BuildRequires: happy
-%endif
-
PreReq: update-alternatives
+
Requires: ghc-compiler = %{version}-%{release}
Requires: ghc-ghc-devel = %{version}-%{release}
Requires: ghc-libraries = %{version}-%{release}
+
# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do
not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
Patch3: Disable-unboxed-arrays.patch
-# PATCH-FIX-UPSTREAM fix-build-using-unregisterized-v8.4.patch
-Patch5: fix-build-using-unregisterized-v8.4.patch
-# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch
-Patch6: fix-unregisterised-v8.4-8.6.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.
@@ -227,21 +202,14 @@
%prep
%setup -q
-#%%patch1 -p1
-#%%patch2 -p1
%ifarch ppc64 s390 s390x
%patch3 -p1
%endif
-%patch5 -p1
-%patch6 -p1
%patch35 -p1
%patch100 -p1
%patch110 -p1
%build
-# patch 1 modifies build system, we need to recreate configure
-# ./boot
-
cat > mk/build.mk <
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-05-11 13:37:20
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.2738 (New)
Package is "ghc"
Mon May 11 13:37:20 2020 rev:84 rq:801074 version:8.10.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-03-09 14:14:26.710548568
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.2738/ghc.changes2020-05-11
13:37:28.952630673 +0200
@@ -1,0 +2,16 @@
+Thu May 7 07:44:47 UTC 2020 - Peter Simons
+
+- Update ghc to version 8.10.1. Important changes are:
+
+ * The UnliftedNewtypes extension, allowing newtypes to be wrap
+types of kind other than Type.
+
+ * The StandaloneKindSignatures extension, allowing explicit
+signatures on type constructors.
+
+ * A new, low-latency garbage collector for the oldest generation.
+
+ Please refer to the compiler documentation for all details:
+
https://downloads.haskell.org/~ghc/8.10.1/docs/html/users_guide/8.10.1-notes.html
+
+---
Old:
ghc-8.8.3-src.tar.xz
ghc-8.8.3-src.tar.xz.sig
New:
fix-build-using-unregisterized-v8.4.patch
ghc-8.10.1-src.tar.xz
ghc-8.10.1-src.tar.xz.sig
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.vq1V2O/_old 2020-05-11 13:37:30.22061 +0200
+++ /var/tmp/diff_new_pack.vq1V2O/_new 2020-05-11 13:37:30.22061 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2019 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
@@ -27,13 +27,14 @@
%endif
%global unregisterised_archs s390 s390x riscv64
+%define full_version 8.10.1
Name: ghc
-Version:8.8.3
+Version:8.10.1
Release:0
URL:https://www.haskell.org/ghc/
-Source:
https://downloads.haskell.org/~ghc/8.8.3/ghc-%{version}-src.tar.xz
-Source1:
https://downloads.haskell.org/~ghc/8.8.3/ghc-%{version}-src.tar.xz.sig
+Source:
https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz
+Source1:
https://downloads.haskell.org/~ghc/%{full_version}/ghc-%{version}-src.tar.xz.sig
Source2:ghc-rpmlintrc
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
@@ -43,8 +44,7 @@
#!BuildIgnore: gcc-PIE
BuildRequires: binutils-devel
BuildRequires: gcc
-BuildRequires: ghc-bootstrap >= 8.4
-BuildRequires: ghc-bootstrap-helpers
+BuildRequires: ghc-bootstrap >= 8.6
BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
@@ -69,11 +69,11 @@
%endif
%ifarch aarch64 %{arm} %{ix86} x86_64
%if 0%{?suse_version} >= 1550
-BuildRequires: llvm7
-Requires: llvm7
+BuildRequires: llvm9-devel
+BuildRequires: clang9
%else
-BuildRequires: llvm
-Requires: llvm
+BuildRequires: llvm-devel
+BuildRequires: clang
%endif
%endif
%if %{undefined without_manual}
@@ -84,14 +84,26 @@
BuildRequires: libnuma-devel
%endif
+# for patch 1
+# BuildRequires: python3
+
+# bogus requires
+%ifarch x86_64
+BuildRequires: ghc-bootstrap-helpers
+%else
+BuildRequires: alex
+BuildRequires: happy
+%endif
+
PreReq: update-alternatives
Requires: ghc-compiler = %{version}-%{release}
Requires: ghc-ghc-devel = %{version}-%{release}
Requires: ghc-libraries = %{version}-%{release}
-
# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do
not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
Patch3: Disable-unboxed-arrays.patch
-# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch ptromm...@icloud.com --
Fix/workaround an issue with unregisterised builds bootstrapped with GHC 8.4
and 8.6. Similar to upstream ticket #15913.
+# PATCH-FIX-UPSTREAM fix-build-using-unregisterized-v8.4.patch
+Patch5: fix-build-using-unregisterized-v8.4.patch
+# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch
Patch6: fix-unregisterised-v8.4-8.6.patch
# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform
Patch35:ghc-pie.patch
@@ -129,16 +141,20 @@
%endif
%ifarch aarch64 %{arm}
%if 0%{?suse_version} >= 1550
-Requires: llvm7
+Requires: clang9
+Requires: llvm9
%else
Requires: llvm
+Requires: clang
%endif
%endif
%ifarch x86_64 %{ix86}
%if 0%{?suse_version} >= 1550
-Suggests: llvm7
+Suggests: clang9
+Suggests: llvm9
%else
Suggests: llvm
+Suggests: clang
%endif
%endi
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-03-09 14:14:21
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.26092 (New)
Package is "ghc"
Mon Mar 9 14:14:21 2020 rev:83 rq:780008 version:8.8.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-02-19 12:41:05.183687690
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.26092/ghc.changes 2020-03-09
14:14:26.710548568 +0100
@@ -1,0 +2,9 @@
+Thu Feb 27 08:47:53 UTC 2020 - Ondřej Súkup
+
+- update to 8.8.3
+ * a compiler panic due to over-zealous eta reduction
+ * the ability to bootstrap with earlier 8.8 releases has been restored
+ * the directory submodule has been updated
+ * the process submodule has been updated
+
+---
Old:
ghc-8.8.2-src.tar.xz
ghc-8.8.2-src.tar.xz.sig
New:
ghc-8.8.3-src.tar.xz
ghc-8.8.3-src.tar.xz.sig
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.rGLK5q/_old 2020-03-09 14:14:27.930549371 +0100
+++ /var/tmp/diff_new_pack.rGLK5q/_new 2020-03-09 14:14:27.930549371 +0100
@@ -29,11 +29,11 @@
%global unregisterised_archs s390 s390x riscv64
Name: ghc
-Version:8.8.2
+Version:8.8.3
Release:0
URL:https://www.haskell.org/ghc/
-Source:
https://downloads.haskell.org/~ghc/8.8.2/ghc-%{version}-src.tar.xz
-Source1:
https://downloads.haskell.org/~ghc/8.8.2/ghc-%{version}-src.tar.xz.sig
+Source:
https://downloads.haskell.org/~ghc/8.8.3/ghc-%{version}-src.tar.xz
+Source1:
https://downloads.haskell.org/~ghc/8.8.3/ghc-%{version}-src.tar.xz.sig
Source2:ghc-rpmlintrc
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
@@ -166,7 +166,7 @@
%ghc_lib_subpackage -d bytestring-0.10.10.0
%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.4.0
+%ghc_lib_subpackage -d directory-1.3.6.0
%ghc_lib_subpackage -d filepath-1.4.2.1
%ghc_lib_subpackage -d -x ghc-%{ghc_version_override}
%ghc_lib_subpackage -d ghc-boot-%{ghc_version_override}
@@ -180,7 +180,7 @@
%ghc_lib_subpackage -d mtl-2.2.2
%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.7.0
+%ghc_lib_subpackage -d process-1.6.8.0
%ghc_lib_subpackage -d stm-2.5.0.0
%ghc_lib_subpackage -d template-haskell-2.15.0.0
%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.4
@@ -282,6 +282,7 @@
make -j 2
%endif
+
%install
%if 0%{?suse_version} <= 1320
%ghc_suse_disable_debug_packages
++ ghc-8.8.2-src.tar.xz -> ghc-8.8.3-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-8.8.2-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new.26092/ghc-8.8.3-src.tar.xz differ: char 25,
line 1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-02-19 12:41:02
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.26092 (New)
Package is "ghc"
Wed Feb 19 12:41:02 2020 rev:82 rq:775057 version:8.8.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-02-06 13:08:06.820332503
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.26092/ghc.changes 2020-02-19
12:41:05.183687690 +0100
@@ -1,0 +2,5 @@
+Mon Feb 17 16:43:22 UTC 2020 - Andreas Schwab
+
+- Increase memory limit for qemu user-space builds
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.pLDWVC/_old 2020-02-19 12:41:06.259689762 +0100
+++ /var/tmp/diff_new_pack.pLDWVC/_new 2020-02-19 12:41:06.259689762 +0100
@@ -269,7 +269,11 @@
%if 0%{?suse_version} >= 1500
%ifarch %{unregisterised_archs}
+%if 0%{?qemu_user_space_build}
+%limit_build -m 15000
+%else
%limit_build -m 8000
+%endif
%else
%limit_build -m 2000
%endif
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-02-06 13:08:05
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.26092 (New)
Package is "ghc"
Thu Feb 6 13:08:05 2020 rev:81 rq:770251 version:8.8.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-02-04 19:56:09.113419537
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.26092/ghc.changes 2020-02-06
13:08:06.820332503 +0100
@@ -1,0 +2,5 @@
+Wed Feb 5 11:16:13 UTC 2020 - Andreas Schwab
+
+- Fix typo in last change
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.a6UUZb/_old 2020-02-06 13:08:08.472333402 +0100
+++ /var/tmp/diff_new_pack.a6UUZb/_new 2020-02-06 13:08:08.472333402 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -268,7 +268,7 @@
--with-system-libffi
%if 0%{?suse_version} >= 1500
-%ifarch unregisterised_archs
+%ifarch %{unregisterised_archs}
%limit_build -m 8000
%else
%limit_build -m 2000
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-02-04 19:56:04
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.26092 (New)
Package is "ghc"
Tue Feb 4 19:56:04 2020 rev:80 rq:769887 version:8.8.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-01-22 22:43:12.612483161
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.26092/ghc.changes 2020-02-04
19:56:09.113419537 +0100
@@ -1,0 +2,10 @@
+Thu Jan 23 09:41:53 UTC 2020 - Peter Trommler
+
+- use ghc-bootstrap-helpers on all archs
+- lower build env requirements on riscv64
+ * make sure we can build on smaller systems
+ * adjust parallelism so we don't hog big workers for almost a week
+ * many thanks to Stefan Bruens for pointing out the issue and
+helping with the solution
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.ZWUAH9/_old 2020-02-04 19:56:11.321420825 +0100
+++ /var/tmp/diff_new_pack.ZWUAH9/_new 2020-02-04 19:56:11.337420835 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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
@@ -44,6 +44,7 @@
BuildRequires: binutils-devel
BuildRequires: gcc
BuildRequires: ghc-bootstrap >= 8.4
+BuildRequires: ghc-bootstrap-helpers
BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
@@ -68,9 +69,11 @@
%endif
%ifarch aarch64 %{arm} %{ix86} x86_64
%if 0%{?suse_version} >= 1550
-BuildRequires: llvm7-devel
+BuildRequires: llvm7
+Requires: llvm7
%else
-BuildRequires: llvm-devel
+BuildRequires: llvm
+Requires: llvm
%endif
%endif
%if %{undefined without_manual}
@@ -81,21 +84,14 @@
BuildRequires: libnuma-devel
%endif
-# bogus requires
-%ifarch x86_64
-BuildRequires: ghc-bootstrap-helpers
-%else
-BuildRequires: alex
-BuildRequires: happy
-%endif
-
PreReq: update-alternatives
Requires: ghc-compiler = %{version}-%{release}
Requires: ghc-ghc-devel = %{version}-%{release}
Requires: ghc-libraries = %{version}-%{release}
+
# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do
not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
Patch3: Disable-unboxed-arrays.patch
-# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch
+# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch ptromm...@icloud.com --
Fix/workaround an issue with unregisterised builds bootstrapped with GHC 8.4
and 8.6. Similar to upstream ticket #15913.
Patch6: fix-unregisterised-v8.4-8.6.patch
# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform
Patch35:ghc-pie.patch
@@ -271,16 +267,16 @@
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
--with-system-libffi
-%ifnarch s390 s390x riscv64
%if 0%{?suse_version} >= 1500
+%ifarch unregisterised_archs
+%limit_build -m 8000
+%else
%limit_build -m 2000
+%endif
make %{?_smp_mflags}
%else
make -j 2
%endif
-%else
-make
-%endif
%install
%if 0%{?suse_version} <= 1320
@@ -448,8 +444,6 @@
%{ghcdocbasedir}/users_guide
%endif
%{ghcdocbasedir}/libraries/gen_contents_index
-#%%{ghcdocbasedir}/libraries/hslogo-16.png
-#%%{ghcdocbasedir}/libraries/ocean.css
%{ghcdocbasedir}/libraries/linuwial.css
%{ghcdocbasedir}/libraries/quick-jump.css
%{ghcdocbasedir}/libraries/prologue.txt
++ _constraints ++
--- /var/tmp/diff_new_pack.ZWUAH9/_old 2020-02-04 19:56:11.413420879 +0100
+++ /var/tmp/diff_new_pack.ZWUAH9/_new 2020-02-04 19:56:11.417420882 +0100
@@ -13,9 +13,9 @@
aarch64
-
+
10
-
+
@@ -23,9 +23,9 @@
riscv64
-
-20
-
+
+17
+
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2020-01-22 22:43:00 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new.26092 (New) Package is "ghc" Wed Jan 22 22:43:00 2020 rev:79 rq:766008 version:8.8.2 Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-01-20 22:52:09.447267640 +0100 +++ /work/SRC/openSUSE:Factory/.ghc.new.26092/ghc.changes 2020-01-22 22:43:12.612483161 +0100 @@ -1,0 +2,5 @@ +Tue Jan 21 07:47:13 UTC 2020 - Guillaume GARDET + +- Update _constraints for aarch64 + +--- Other differences: -- ++ _constraints ++ --- /var/tmp/diff_new_pack.L8A2RL/_old 2020-01-22 22:43:14.104483912 +0100 +++ /var/tmp/diff_new_pack.L8A2RL/_new 2020-01-22 22:43:14.104483912 +0100 @@ -10,6 +10,7 @@ s390x + aarch64
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-01-20 22:51:22
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.26092 (New)
Package is "ghc"
Mon Jan 20 22:51:22 2020 rev:78 rq:765570 version:8.8.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2020-01-03 17:35:18.959244279
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.26092/ghc.changes 2020-01-20
22:52:09.447267640 +0100
@@ -1,0 +2,28 @@
+Thu Jan 16 19:08:53 UTC 2020 - Peter Trommler
+
+- drop 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
+ * fixed upstream
+- drop D5212.patch
+ * fixed upstream
+- drop fix-build-using-unregisterized-v8.4.patch
+ * bootstrap compiler is 8.6.5 now
+- refresh fix-unregisterised-v8.4-8.6.patch
+- clean up spec file
+
+---
+Thu Jan 16 17:56:27 UTC 2020 - Ondřej Súkup
+
+- update to 8.8.2
+ * A bug (Issue #17088) in the compacting garbage collector resulting in
segmentation
+ faults under specific circumstances. Note that this may affect user
programs even
+ if they did not explicitly request the compacting GC (using the -c RTS flag)
+ since GHC may fallback to compacting collection during times of high memory
pressure.
+ * A code generator bug (Issue #17334) resulting in GHC panics has been fixed.
+ * A typechecker bug (Issue #17112) resulting in GHC panicking on some programs
+ has been fixed.
+ * A bug (Issue #16707) in the implementation of software transactional memory
+ potentially resulting in hanging transactions has been fixed.
+ * A bug in the implementation of compact normal forms resulting in
segmentation
+ faults in some uses (Issue #17044) has been fixed.
+
+---
Old:
0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
D5212.patch
fix-build-using-unregisterized-v8.4.patch
ghc-8.8.1-src.tar.xz
ghc-8.8.1-src.tar.xz.sig
New:
ghc-8.8.2-src.tar.xz
ghc-8.8.2-src.tar.xz.sig
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.8rDMGE/_old 2020-01-20 22:52:11.379268384 +0100
+++ /var/tmp/diff_new_pack.8rDMGE/_new 2020-01-20 22:52:11.379268384 +0100
@@ -29,11 +29,11 @@
%global unregisterised_archs s390 s390x riscv64
Name: ghc
-Version:8.8.1
+Version:8.8.2
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
+Source:
https://downloads.haskell.org/~ghc/8.8.2/ghc-%{version}-src.tar.xz
+Source1:
https://downloads.haskell.org/~ghc/8.8.2/ghc-%{version}-src.tar.xz.sig
Source2:ghc-rpmlintrc
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
@@ -81,9 +81,6 @@
BuildRequires: libnuma-devel
%endif
-# for patch 1
-# BuildRequires: python3
-
# bogus requires
%ifarch x86_64
BuildRequires: ghc-bootstrap-helpers
@@ -96,14 +93,8 @@
Requires: ghc-compiler = %{version}-%{release}
Requires: ghc-ghc-devel = %{version}-%{release}
Requires: ghc-libraries = %{version}-%{release}
-# PATCH-FIX-UPSTREAM
0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
ptromm...@icloud.com -- Fix __atomic_builtin detection. Patch taken from
upstream commit ce3897ff.
-Patch1: 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
-# PATCH-FIX-UPSTREAM D5212.patch ptromm...@icloud.com -- Fix GHCi on big
endiansystems. Submitted for upstream review.
-Patch2: D5212.patch
# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do
not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
Patch3: Disable-unboxed-arrays.patch
-# PATCH-FIX-UPSTREAM fix-build-using-unregisterized-v8.4.patch
-Patch5: fix-build-using-unregisterized-v8.4.patch
# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch
Patch6: fix-unregisterised-v8.4-8.6.patch
# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform
@@ -172,14 +163,14 @@
%endif
%if %{defined ghclibdir}
-%ghc_lib_subpackage -d Cabal-3.0.0.0
+%ghc_lib_subpackage -d Cabal-3.0.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.13.0.0
%ghc_lib_subpackage -d binary-0.8.7.0
-%ghc_lib_subpackage -d bytestring-0.10.9.0
+%ghc_lib_subpackage -d bytestring-0.10.10.0
%ghc_lib_subpackage -d containers-0.6.2.1
%ghc_lib_subpackage -d deepseq-1.4.4.0
-%ghc_lib_subpackag
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2020-01-03 17:35:04
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.6675 (New)
Package is "ghc"
Fri Jan 3 17:35:04 2020 rev:77 rq:760279 version:8.8.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2019-12-24 14:30:05.526579492
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.6675/ghc.changes2020-01-03
17:35:18.959244279 +0100
@@ -1,0 +2,27 @@
+Tue Dec 31 18:17:24 UTC 2019 - Peter Trommler
+
+- add fix-unregisterised-v8.4-8.6.patch
+* fix build on s390x and riscv64
+
+---
+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
+
+- use prebuilt alex and happy on Tumbleweed to avoid buildcycle
+- Don't require llvm in ghc-compiler for other architectures than arm
+
+---
+Sat Dec 28 22:38:34 UTC 2019 - Ondřej Súkup
+
+- update to 8.8.1 -new stable release
+- refresh Disable-unboxed-arrays.patch
+- drop allow-riscv-and-riscv64-CPU.patch - merged in upstream
+
+---
Old:
allow-riscv-and-riscv64-CPU.patch
ghc-8.6.5-src.tar.xz
New:
fix-unregisterised-v8.4-8.6.patch
ghc-8.8.1-src.tar.xz
ghc-8.8.1-src.tar.xz.sig
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.UglQTS/_old 2020-01-03 17:35:20.691245167 +0100
+++ /var/tmp/diff_new_pack.UglQTS/_new 2020-01-03 17:35:20.695245170 +0100
@@ -29,18 +29,21 @@
%global unregisterised_archs s390 s390x riscv64
Name: ghc
-Version:8.6.5
+Version:8.8.1
Release:0
-Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
+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
+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 riscv64
+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
BuildRequires: gcc
-BuildRequires: ghc-bootstrap >= 8.0
+BuildRequires: ghc-bootstrap >= 8.4
BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
@@ -65,7 +68,7 @@
%endif
%ifarch aarch64 %{arm} %{ix86} x86_64
%if 0%{?suse_version} >= 1550
-BuildRequires: llvm6-devel
+BuildRequires: llvm7-devel
%else
BuildRequires: llvm-devel
%endif
@@ -79,24 +82,30 @@
%endif
# for patch 1
-BuildRequires: python3
+# BuildRequires: python3
+
+# bogus requires
+%ifarch x86_64
+BuildRequires: ghc-bootstrap-helpers
+%else
+BuildRequires: alex
+BuildRequires: happy
+%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-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
ptromm...@icloud.com -- Fix __atomic_builtin detection. Patch taken from
upstream commit ce3897ff.
Patch1: 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
# PATCH-FIX-UPSTREAM D5212.patch ptromm...@icloud.com -- Fix GHCi on big
endiansystems. Submitted for upstream review.
Patch2: D5212.patch
# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do
not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
Patch3: Disable-unboxed-arrays.patch
-# PATCH-FIX-UPSTREAM allow-riscv-and-riscv64-CPU.patch sly...@gentoo.org --
aclocal.m4: allow riscv and riscv64 CPU
-Patch4: allow-riscv-and-riscv64-CPU.patch
# PATCH-FIX-UPSTREAM fix-build-using-unregisterized-v8.4.patch
Patch5: fix-build-using-unregisterized-v8.4.patch
+# PATCH-FIX-UPSTREAM fix-unregisterised-v8.4-8.6.patch
+Patch6: fix-unregisterised-v8.4-8.6.patch
# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2019-12-24 14:29:56 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new.6675 (New) Package is "ghc" Tue Dec 24 14:29:56 2019 rev:76 rq:759112 version:8.6.5 Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2019-10-07 14:13:54.806923181 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new.6675/ghc.changes2019-12-24 14:30:05.526579492 +0100 @@ -1,0 +2,7 @@ +Mon Sep 23 10:07:24 UTC 2019 - Peter Trommler + +- add fix-build-using-unregisterized-v8.4.patch + * fixes unregisterised builds when bootstrap compiler is GHC 8.4 + * fixes build on s390x + +--- New: fix-build-using-unregisterized-v8.4.patch Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.RBZE9M/_old 2019-12-24 14:30:06.946580179 +0100 +++ /var/tmp/diff_new_pack.RBZE9M/_new 2019-12-24 14:30:06.950580181 +0100 @@ -95,6 +95,8 @@ Patch3: Disable-unboxed-arrays.patch # PATCH-FIX-UPSTREAM allow-riscv-and-riscv64-CPU.patch sly...@gentoo.org -- aclocal.m4: allow riscv and riscv64 CPU Patch4: allow-riscv-and-riscv64-CPU.patch +# PATCH-FIX-UPSTREAM fix-build-using-unregisterized-v8.4.patch +Patch5: fix-build-using-unregisterized-v8.4.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. @@ -210,6 +212,7 @@ %patch3 -p1 %endif %patch4 -p1 +%patch5 -p1 %patch35 -p1 %patch100 -p1 %patch110 -p1 @@ -275,7 +278,7 @@ make -j 2 %endif %else -make -j 2 +make %endif %install ++ _constraints ++ --- /var/tmp/diff_new_pack.RBZE9M/_old 2019-12-24 14:30:07.042580226 +0100 +++ /var/tmp/diff_new_pack.RBZE9M/_new 2019-12-24 14:30:07.058580233 +0100 @@ -7,13 +7,23 @@ 4 + + + s390x + + + +10 + + + riscv64 - 20 +20 ++ fix-build-using-unregisterized-v8.4.patch ++ Description: Allow unregisterised ghc-8.4 to build newer GHC Commit 4075656e8bb introduced a regression stopping existing unregisteristed compilers from being able to compile newer versions of GHC. The problem is that the bootstrap compiler uses the newer `rts/storage/ClosureTypes.h` file where some defines have been renamed, resulting in the following error: . error: ‘stg_MUT_ARR_PTRS_FROZEN0_info’ undeclared (first use in this function); did you mean ‘stg_MUT_ARR_PTRS_FROZEN_DIRTY_info’? . For more information, see https://gitlab.haskell.org/ghc/ghc/issues/15913. . This patch can be removed, once ghc-8.4 is no longer the bootstrap compiler. Author: Ilias Tsitsimpis Bug: https://gitlab.haskell.org/ghc/ghc/issues/15913 Bug-Debian: https://bugs.debian.org/932941 Index: b/includes/rts/storage/ClosureTypes.h === --- a/includes/rts/storage/ClosureTypes.h +++ b/includes/rts/storage/ClosureTypes.h @@ -82,5 +82,11 @@ #define SMALL_MUT_ARR_PTRS_DIRTY 60 #define SMALL_MUT_ARR_PTRS_FROZEN_DIRTY 61 #define SMALL_MUT_ARR_PTRS_FROZEN_CLEAN 62 +#if __GLASGOW_HASKELL__ < 806 +#define SMALL_MUT_ARR_PTRS_FROZEN0 SMALL_MUT_ARR_PTRS_FROZEN_DIRTY +#define SMALL_MUT_ARR_PTRS_FROZEN SMALL_MUT_ARR_PTRS_FROZEN_CLEAN +#define MUT_ARR_PTRS_FROZEN0 MUT_ARR_PTRS_FROZEN_DIRTY +#define MUT_ARR_PTRS_FROZEN MUT_ARR_PTRS_FROZEN_CLEAN +#endif #define COMPACT_NFDATA63 #define N_CLOSURE_TYPES 64 Index: b/includes/stg/MiscClosures.h === --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -116,12 +116,22 @@ RTS_ENTRY(stg_ARR_WORDS); RTS_ENTRY(stg_MUT_ARR_WORDS); RTS_ENTRY(stg_MUT_ARR_PTRS_CLEAN); RTS_ENTRY(stg_MUT_ARR_PTRS_DIRTY); +#if __GLASGOW_HASKELL__ < 806 +RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN); +RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN0); +#else RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN_CLEAN); RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN_DIRTY); +#endif RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_CLEAN); RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_DIRTY); +#if __GLASGOW_HASKELL__ < 806 +RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN); +RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN0); +#else RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN_CLEAN); RTS_ENTRY(stg_SMALL_MUT_ARR_PTRS_FROZEN_DIRTY); +#endif RTS_ENTRY(stg_MUT_VAR_CLEAN); RTS_ENTRY(stg_MUT_VAR_DIRTY); RTS_ENTRY(stg_END_TSO_QUEUE);
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2019-10-07 13:46:04
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.2352 (New)
Package is "ghc"
Mon Oct 7 13:46:04 2019 rev:75 rq:734101 version:8.6.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2019-04-26 22:55:12.749285660
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new.2352/ghc.changes2019-10-07
14:13:54.806923181 +0200
@@ -1,0 +2,8 @@
+Mon Sep 23 09:28:37 UTC 2019 - Andreas Schwab
+
+- Enable build on riscv64
+- Add memory constraints for riscv64, restrict to 2 jobs
+- allow-riscv-and-riscv64-CPU.patch: recognize riscv64 as architecture
+- Apply Disable-unboxed-arrays.patch also on s390x
+
+---
New:
allow-riscv-and-riscv64-CPU.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.CcCkfu/_old 2019-10-07 14:13:55.642920887 +0200
+++ /var/tmp/diff_new_pack.CcCkfu/_new 2019-10-07 14:13:55.642920887 +0200
@@ -26,7 +26,7 @@
%define with_libnuma 0
%endif
-%global unregisterised_archs s390 s390x
+%global unregisterised_archs s390 s390x riscv64
Name: ghc
Version:8.6.5
@@ -35,7 +35,7 @@
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 s390x riscv64
# hard to port to PIE, some prebuilt static libraries are non-PIC ...
#!BuildIgnore: gcc-PIE
BuildRequires: binutils-devel
@@ -93,6 +93,8 @@
Patch2: D5212.patch
# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do
not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
Patch3: Disable-unboxed-arrays.patch
+# PATCH-FIX-UPSTREAM allow-riscv-and-riscv64-CPU.patch sly...@gentoo.org --
aclocal.m4: allow riscv and riscv64 CPU
+Patch4: allow-riscv-and-riscv64-CPU.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.
@@ -204,9 +206,10 @@
%setup -q
%patch1 -p1
%patch2 -p1
-%ifarch ppc64
+%ifarch ppc64 s390 s390x
%patch3 -p1
%endif
+%patch4 -p1
%patch35 -p1
%patch100 -p1
%patch110 -p1
@@ -264,7 +267,7 @@
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
--with-system-libffi
-%ifnarch s390 s390x
+%ifnarch s390 s390x riscv64
%if 0%{?suse_version} >= 1500
%limit_build -m 2000
make %{?_smp_mflags}
++ _constraints ++
--- /var/tmp/diff_new_pack.CcCkfu/_old 2019-10-07 14:13:55.674920799 +0200
+++ /var/tmp/diff_new_pack.CcCkfu/_new 2019-10-07 14:13:55.674920799 +0200
@@ -7,4 +7,14 @@
4
+
+
+ riscv64
+
+
+
+ 20
+
+
+
++ allow-riscv-and-riscv64-CPU.patch ++
Description: cherry-pick of upstream commits
beba89a0f16681c85d39fc8a894bde4162ff492a.patch:
5e63a25249f3cb07300258e115af9ff55079d2ea.patch:
Last-Update: 2019-05-27
Index: ghc-8.6.5/aclocal.m4
===
--- ghc-8.6.5.orig/aclocal.m4
+++ ghc-8.6.5/aclocal.m4
@@ -217,7 +217,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
mipsel)
test -z "[$]2" || eval "[$]2=ArchMipsel"
;;
-hppa|hppa1_1|ia64|m68k|nios2|rs6000|s390|s390x|sh4|vax)
+hppa|hppa1_1|ia64|m68k|nios2|riscv32|riscv64|rs6000|s390|s390x|sh4|vax)
test -z "[$]2" || eval "[$]2=ArchUnknown"
;;
*)
@@ -1906,6 +1906,12 @@ case "$1" in
powerpc*)
$2="powerpc"
;;
+ riscv64*)
+$2="riscv64"
+;;
+ riscv|riscv32*)
+$2="riscv32"
+;;
rs6000)
$2="rs6000"
;;
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2019-04-26 22:55:07
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.5536 (New)
Package is "ghc"
Fri Apr 26 22:55:07 2019 rev:74 rq:698158 version:8.6.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2019-03-14 15:01:21.107695511
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.5536/ghc.changes2019-04-26
22:55:12.749285660 +0200
@@ -1,0 +2,6 @@
+Thu Apr 25 22:11:40 UTC 2019 - Ondřej Súkup
+
+- update to 8.6.5
+ * A build system issue where use of GCC with -flto broke configure was fixed
+
+---
Old:
ghc-8.6.4-src.tar.xz
New:
ghc-8.6.5-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.jslIJj/_old 2019-04-26 22:55:14.093284794 +0200
+++ /var/tmp/diff_new_pack.jslIJj/_new 2019-04-26 22:55:14.093284794 +0200
@@ -29,7 +29,7 @@
%global unregisterised_archs s390 s390x
Name: ghc
-Version:8.6.4
+Version:8.6.5
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Summary:The Glorious Glasgow Haskell Compiler
++ ghc-8.6.4-src.tar.xz -> ghc-8.6.5-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-8.6.4-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new.5536/ghc-8.6.5-src.tar.xz differ: char 26,
line 1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2019-03-14 15:00:41
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.28833 (New)
Package is "ghc"
Thu Mar 14 15:00:41 2019 rev:73 rq:684708 version:8.6.4
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2019-03-13 09:14:14.947392809
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.28833/ghc.changes 2019-03-14
15:01:21.107695511 +0100
@@ -1,0 +2,5 @@
+Wed Mar 13 14:35:13 UTC 2019 - Ondřej Súkup
+
+- really bump llvm5 to llvm6 requires for ghc-compiler
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.C6Tq7G/_old 2019-03-14 15:01:22.479695241 +0100
+++ /var/tmp/diff_new_pack.C6Tq7G/_new 2019-03-14 15:01:22.487695239 +0100
@@ -128,8 +128,8 @@
Requires: binutils-gold
%endif
%ifarch aarch64 %{arm} %{ix86} x86_64
-%if 0%{?suse_version} >= 1500
-Requires: llvm5
+%if 0%{?suse_version} >= 1550
+Requires: llvm6
%else
Requires: llvm
%endif
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2019-03-13 09:14:13
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.28833 (New)
Package is "ghc"
Wed Mar 13 09:14:13 2019 rev:72 rq:684346 version:8.6.4
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2019-03-08 11:02:38.468528941
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.28833/ghc.changes 2019-03-13
09:14:14.947392809 +0100
@@ -1,0 +2,5 @@
+Tue Mar 12 09:20:14 UTC 2019 - Ondřej Súkup
+
+- bump llvm req to llvm6
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.QgWcAE/_old 2019-03-13 09:14:15.851392716 +0100
+++ /var/tmp/diff_new_pack.QgWcAE/_new 2019-03-13 09:14:15.855392716 +0100
@@ -64,8 +64,8 @@
BuildRequires: binutils-gold
%endif
%ifarch aarch64 %{arm} %{ix86} x86_64
-%if 0%{?suse_version} >= 1500
-BuildRequires: llvm5-devel
+%if 0%{?suse_version} >= 1550
+BuildRequires: llvm6-devel
%else
BuildRequires: llvm-devel
%endif
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2019-03-08 11:02:35
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.28833 (New)
Package is "ghc"
Fri Mar 8 11:02:35 2019 rev:71 rq:682268 version:8.6.4
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-12-28 12:35:21.791961749
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.28833/ghc.changes 2019-03-08
11:02:38.468528941 +0100
@@ -1,0 +2,13 @@
+Wed Mar 6 08:49:44 UTC 2019 - Ondřej Súkup
+
+- update to 8.6.4
+ * A bug wherein changes in default method definitions would fail
+to trigger recompilation has been fixed
+ * A bug wherein plugins would fail to lookup names not in scope
+in the module being compiled has been fixed
+ * A bug where some programs involving StaticData would be rejected
+with either a typechecking error or internal compiler error has been fixed
+ * A bug where compilation on Windows can fail with linker errors
+referring to __chkstk_ms has been fixed
+
+---
Old:
ghc-8.6.3-src.tar.xz
New:
ghc-8.6.4-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.9nBt5S/_old 2019-03-08 11:02:39.404528792 +0100
+++ /var/tmp/diff_new_pack.9nBt5S/_new 2019-03-08 11:02:39.404528792 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -29,7 +29,7 @@
%global unregisterised_archs s390 s390x
Name: ghc
-Version:8.6.3
+Version:8.6.4
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Summary:The Glorious Glasgow Haskell Compiler
@@ -173,13 +173,13 @@
%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 process-1.6.5.0
%ghc_lib_subpackage -d stm-2.5.0.0
%ghc_lib_subpackage -d template-haskell-2.14.0.0
%ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.2
%ghc_lib_subpackage -d text-1.2.3.1
%ghc_lib_subpackage -d time-1.8.0.2
-%ghc_lib_subpackage -d transformers-0.5.5.0
+%ghc_lib_subpackage -d transformers-0.5.6.2
%ghc_lib_subpackage -d unix-2.7.2.2
%ghc_lib_subpackage -d xhtml-3000.2.2.1
%endif
++ ghc-8.6.3-src.tar.xz -> ghc-8.6.4-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-8.6.3-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new.28833/ghc-8.6.4-src.tar.xz differ: char 27,
line 1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-12-28 12:35:05
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.28833 (New)
Package is "ghc"
Fri Dec 28 12:35:05 2018 rev:70 rq:661492 version:8.6.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-12-10 12:29:33.246454060
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.28833/ghc.changes 2018-12-28
12:35:21.791961749 +0100
@@ -1,0 +2,5 @@
+Mon Dec 17 13:26:47 UTC 2018 - Ondřej Súkup
+
+- use python3-Sphinx instead deprecated python-sphinx [boo#1119686]
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.3brAeo/_old 2018-12-28 12:35:22.687961123 +0100
+++ /var/tmp/diff_new_pack.3brAeo/_new 2018-12-28 12:35:22.691961120 +0100
@@ -71,7 +71,7 @@
%endif
%endif
%if %{undefined without_manual}
-BuildRequires: python-sphinx
+BuildRequires: python3-Sphinx
%endif
%if %with_libnuma
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-12-10 12:29:29
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new.19453 (New)
Package is "ghc"
Mon Dec 10 12:29:29 2018 rev:69 rq:656583 version:8.6.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-11-08 09:50:34.588952102
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new.19453/ghc.changes 2018-12-10
12:29:33.246454060 +0100
@@ -1,0 +2,9 @@
+Sat Dec 8 10:28:03 UTC 2018 - Ondřej Súkup
+
+- update to 8.6.3
+ * A code generation bug resulting in segmentations faults in some programs
+ * bug leading to programs with deep stacks crashing when run with retainer
profiling enabled
+ * A bug resulting in potential heap corruption during stable name allocation
+ * Plugins are now loaded during GHCi sessions
+
+---
Old:
ghc-8.6.2-src.tar.xz
New:
ghc-8.6.3-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.6iGZDY/_old 2018-12-10 12:29:34.218453088 +0100
+++ /var/tmp/diff_new_pack.6iGZDY/_new 2018-12-10 12:29:34.218453088 +0100
@@ -29,7 +29,7 @@
%global unregisterised_archs s390 s390x
Name: ghc
-Version:8.6.2
+Version:8.6.3
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Summary:The Glorious Glasgow Haskell Compiler
@@ -169,7 +169,7 @@
%ghc_lib_subpackage -d -x ghci-%{ghc_version_override}
%ghc_lib_subpackage -d haskeline-0.7.4.3
%ghc_lib_subpackage -d hpc-0.6.0.3
-%ghc_lib_subpackage -d libiserv-8.6.1
+%ghc_lib_subpackage -d libiserv-8.6.3
%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-8.6.2-src.tar.xz -> ghc-8.6.3-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-8.6.2-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new.19453/ghc-8.6.3-src.tar.xz differ: char 27,
line 1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-11-08 09:50:24
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Thu Nov 8 09:50:24 2018 rev:68 rq:646943 version:8.6.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-11-06 14:40:40.540479374
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-11-08
09:50:34.588952102 +0100
@@ -1,0 +2,21 @@
+Wed Nov 7 10:00:46 UTC 2018 - Ondřej Súkup
+
+- dont require memory-constraints on older distros
+- dropped reproducible-tmp-names.patch
+
+---
+Tue Nov 6 13:56:27 UTC 2018 - Ondřej Súkup
+
+- update to 8.6.2
+ * Several compiler panics observed in GHC 8.6.1 have been fixed
+ * An integer overflow, resulting in some encodeFloat uses returning
+incorrect results, has been fixed
+ * A long-standing bug in the LLVM code generator, resulting in incorrect
+floating point evaluation, has been fixed.
+ * A long-standing bug exposed in GHC 8.6.1, has been fixed. This issue
+resulted in undefined runtime behavior with some uses of the dataToTag#
+primop. Note that this issue, while less likely to manifest, has existed
+in some form in all GHC releases prior to this release and may result
+in silent, incorrect evaluation.
+
+---
Old:
ghc-8.6.1-src.tar.xz
reproducible-tmp-names.patch
New:
ghc-8.6.2-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.OxqKse/_old 2018-11-08 09:50:36.064950357 +0100
+++ /var/tmp/diff_new_pack.OxqKse/_new 2018-11-08 09:50:36.068950352 +0100
@@ -29,7 +29,7 @@
%global unregisterised_archs s390 s390x
Name: ghc
-Version:8.6.1
+Version:8.6.2
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Summary:The Glorious Glasgow Haskell Compiler
@@ -53,7 +53,10 @@
BuildRequires: libffi-devel
%endif
BuildRequires: libtool
+# not resolvable on ppc
+%if 0%{?suse_version} >= 1500
BuildRequires: memory-constraints
+%endif
BuildRequires: ncurses-devel
BuildRequires: pkg-config
BuildRequires: xz
@@ -61,7 +64,7 @@
BuildRequires: binutils-gold
%endif
%ifarch aarch64 %{arm} %{ix86} x86_64
-%if %{suse_version} >= 1500
+%if 0%{?suse_version} >= 1500
BuildRequires: llvm5-devel
%else
BuildRequires: llvm-devel
@@ -96,8 +99,6 @@
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
%description
Haskell is the standard purely functional programming language; the
@@ -152,7 +153,7 @@
%if %{defined ghclibdir}
%ghc_lib_subpackage -d Cabal-2.4.0.1
-%ghc_lib_subpackage -d array-0.5.2.0
+%ghc_lib_subpackage -d array-0.5.3.0
%ghc_lib_subpackage -d -c
gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-4.12.0.0
%ghc_lib_subpackage -d binary-0.8.6.0
%ghc_lib_subpackage -d bytestring-0.10.8.2
@@ -168,7 +169,7 @@
%ghc_lib_subpackage -d -x ghci-%{ghc_version_override}
%ghc_lib_subpackage -d haskeline-0.7.4.3
%ghc_lib_subpackage -d hpc-0.6.0.3
-%ghc_lib_subpackage -d libiserv-%{ghc_version_override}
+%ghc_lib_subpackage -d libiserv-8.6.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
@@ -209,8 +210,6 @@
%patch35 -p1
%patch100 -p1
%patch110 -p1
-#%%patch111 -p1
-# Probably fixed upstream
%build
# patch 1 modifies build system, we need to recreate configure
@@ -266,11 +265,15 @@
--with-system-libffi
%ifnarch s390 s390x
+%if 0%{?suse_version} >= 1500
%limit_build -m 2000
make %{?_smp_mflags}
%else
make -j 2
%endif
+%else
+make -j 2
+%endif
%install
%if 0%{?suse_version} <= 1320
++ ghc-8.6.1-src.tar.xz -> ghc-8.6.2-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-8.6.1-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new/ghc-8.6.2-src.tar.xz differ: char 25, line 1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-11-06 14:40:35
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Tue Nov 6 14:40:35 2018 rev:67 rq:646490 version:8.6.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-10-25 08:20:53.963950241
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-11-06
14:40:40.540479374 +0100
@@ -1,0 +2,10 @@
+Mon Oct 29 08:25:23 UTC 2018 - Guillaume GARDET
+
+- Make use of memory-constraints to avoid OOM errors
+
+---
+Fri Oct 26 08:01:13 UTC 2018 - Guillaume GARDET
+
+- Remove forced 'make -j2' for aarch64 and %arm
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.KQfQ4B/_old 2018-11-06 14:40:41.604477767 +0100
+++ /var/tmp/diff_new_pack.KQfQ4B/_new 2018-11-06 14:40:41.612477755 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -53,6 +53,7 @@
BuildRequires: libffi-devel
%endif
BuildRequires: libtool
+BuildRequires: memory-constraints
BuildRequires: ncurses-devel
BuildRequires: pkg-config
BuildRequires: xz
@@ -264,7 +265,8 @@
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
--with-system-libffi
-%ifnarch aarch64 %{arm} s390 s390x
+%ifnarch s390 s390x
+%limit_build -m 2000
make %{?_smp_mflags}
%else
make -j 2
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-10-25 08:20:16
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Thu Oct 25 08:20:16 2018 rev:66 rq:642934 version:8.6.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-10-02 19:48:25.985768040
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-10-25
08:20:53.963950241 +0200
@@ -1,0 +2,32 @@
+Tue Oct 9 15:50:06 UTC 2018 - ptromm...@icloud.com
+
+- add Disable-unboxed-arrays.patch
+ * apply on ppc64 only
+ * fixes ppc64 build
+- add D5212.patch
+ * fix GHCi on big endian platforms
+
+---
+Tue Oct 2 11:28:19 UTC 2018 - ptromm...@icloud.com
+
+- cleanup
+ * remove unused conditional in configure command
+
+---
+Tue Oct 2 10:10:24 UTC 2018 - ptromm...@icloud.com
+
+- update to 8.6.1
+- add 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
+ * fix __atomic_builtin detection
+ * upstream commit ce3897ff
+- drop add_armv6l_and_armv7l_target.patch
+ * fixed upstream
+- drop fix-ppc64le-recognition.patch
+ * fixed upstream
+- drop fix-build-using-unregisterized-v8.2.patch
+ * bootstrap with 8.4.3 works w/o this patch
+- refresh ghc-pie.patch
+- refresh ghc-8.0.2-Cabal-dyndir.patch
+- refresh buildpath-abi-stability.patch
+
+---
Old:
add_armv6l_and_armv7l_target.patch
fix-build-using-unregisterized-v8.2.patch
fix-ppc64le-recognition.patch
ghc-8.4.3-src.tar.xz
New:
0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
D5212.patch
Disable-unboxed-arrays.patch
ghc-8.6.1-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.2Tb699/_old 2018-10-25 08:20:54.915949816 +0200
+++ /var/tmp/diff_new_pack.2Tb699/_new 2018-10-25 08:20:54.919949814 +0200
@@ -29,7 +29,7 @@
%global unregisterised_archs s390 s390x
Name: ghc
-Version:8.4.3
+Version:8.6.1
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Summary:The Glorious Glasgow Haskell Compiler
@@ -74,18 +74,21 @@
BuildRequires: libnuma-devel
%endif
+# for patch 1
+BuildRequires: python3
+
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 add_armv6l_and_armv7l_target.patch - add armv6l and
armv7l target to llvm targets
-Patch0: add_armv6l_and_armv7l_target.patch
-# PATCH-FIX-UPSTREAM fix-ppc64le-recognition.patch ptromm...@icloud.com --
Recognize powerpc64le as PPC64 in cabal files.
-Patch1: fix-ppc64le-recognition.patch
-# PATCH-FIX-OPENSUSE fix-build-using-unregisterized-v8.2.patch
ptromm...@icloud.com -- Fix bootstrap with GHC older than 8.4. Can be dropped
once we bootstrap with 8.4.3. Debian patch.
-Patch2: fix-build-using-unregisterized-v8.2.patch
+# PATCH-FIX-UPSTREAM
0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
ptromm...@icloud.com -- Fix __atomic_builtin detection. Patch taken from
upstream commit ce3897ff.
+Patch1: 0001-Fix-check-whether-GCC-supports-__atomic_-builtins.patch
+# PATCH-FIX-UPSTREAM D5212.patch ptromm...@icloud.com -- Fix GHCi on big
endiansystems. Submitted for upstream review.
+Patch2: D5212.patch
+# PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptromm...@icloud.com -- Do
not use unboxed arrays on big-endian platforms. See Haskell Trac #15411.
+Patch3: Disable-unboxed-arrays.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.
@@ -147,30 +150,32 @@
%endif
%if %{defined ghclibdir}
-%ghc_lib_subpackage -d Cabal-2.2.0.1
+%ghc_lib_subpackage -d Cabal-2.4.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 -c
gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-4.12.0.0
+%ghc_lib_subpackage -d binary-0.8.6.0
%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 -
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2018-10-02 19:47:12 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Tue Oct 2 19:47:12 2018 rev:65 rq:639256 version:8.4.3 Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-09-11 17:20:00.947160261 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-10-02 19:48:25.985768040 +0200 @@ -1,0 +2,6 @@ +Sun Sep 30 11:21:59 UTC 2018 - ptromm...@icloud.com + +- Add fix-build-using-unregisterized-v8.2.patch + * Fix build on s390x + +--- New: fix-build-using-unregisterized-v8.2.patch Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.V1dPuX/_old 2018-10-02 19:48:26.765767231 +0200 +++ /var/tmp/diff_new_pack.V1dPuX/_new 2018-10-02 19:48:26.769767227 +0200 @@ -84,6 +84,8 @@ Patch0: add_armv6l_and_armv7l_target.patch # PATCH-FIX-UPSTREAM fix-ppc64le-recognition.patch ptromm...@icloud.com -- Recognize powerpc64le as PPC64 in cabal files. Patch1: fix-ppc64le-recognition.patch +# PATCH-FIX-OPENSUSE fix-build-using-unregisterized-v8.2.patch ptromm...@icloud.com -- Fix bootstrap with GHC older than 8.4. Can be dropped once we bootstrap with 8.4.3. Debian patch. +Patch2: fix-build-using-unregisterized-v8.2.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. @@ -195,6 +197,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch35 -p1 %patch100 -p1 %patch110 -p1 ++ fix-build-using-unregisterized-v8.2.patch ++ Description: Allow unregisterised ghc-8.2 to build newer GHC Commit b68697e579d38ca29c2b84377dc2affa04659a28 introduced a regression stopping existing unregisteristed compilers from being used to compile a newer version of GHC. The problem is that the bootstrap compiler uses the newer Stg.h where EB_, IB_, etc, definitions have changed resulting in the following error: . error: conflicting types for 'ghc_GhcPrelude_zdtrModule4_bytes' note: in definition of macro 'EB_' #define EB_(X)extern const char X[] note: previous definition of 'ghc_GhcPrelude_zdtrModule4_bytes' was here char ghc_GhcPrelude_zdtrModule4_bytes[] = "ghc"; . For more information about the problem, see https://phabricator.haskell.org/D4114. . This patch is a rework of https://phabricator.haskell.org/D3741. It modifies Stg.h to include the old definitions, if a compiler older than 8.4 is being used. . This patch can be removed, once ghc-8.2 is no longer the bootstrap compiler. Author: Ilias Tsitsimpis Bug: https://ghc.haskell.org/trac/ghc/ticket/15201 Index: b/includes/Stg.h === --- a/includes/Stg.h +++ b/includes/Stg.h @@ -232,6 +232,16 @@ typedef StgIntI_; typedef StgWord StgWordArray[]; typedef StgFunPtr F_; +#if __GLASGOW_HASKELL__ < 804 +#define EB_(X)extern char X[] +#define IB_(X)static char X[] +#define EI_(X) extern StgWordArray (X) GNU_ATTRIBUTE(aligned (8)) +#define II_(X) static StgWordArray (X) GNU_ATTRIBUTE(aligned (8)) +#define IF_(f)static StgFunPtr GNUC3_ATTRIBUTE(used) f(void) +#define FN_(f)StgFunPtr f(void) +#define EF_(f)StgFunPtr f(void) /* External Cmm functions */ +#define EFF_(f) void f() /* See Note [External function prototypes] */ +#else /* byte arrays (and strings): */ #define EB_(X)extern const char X[] #define IB_(X)static const char X[] @@ -250,6 +260,7 @@ typedef StgFunPtr F_; #define EF_(f) StgFunPtr f(void) /* External Cmm functions */ /* foreign functions: */ #define EFF_(f) void f() /* See Note [External function prototypes] */ +#endif /* __GLASGOW_HASKELL__ < 804 */ /* Note [External function prototypes] See Trac #8965, #11395 ~~~
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-09-11 17:19:48
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Tue Sep 11 17:19:48 2018 rev:64 rq:634780 version:8.4.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-07-21 10:21:13.419015242
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-09-11
17:20:00.947160261 +0200
@@ -1,0 +2,6 @@
+Thu Sep 6 15:19:54 UTC 2018 - mman...@outlook.de
+
+- Fix armv6 build by adding armv6l to llvm-targets:
+ * change add_armv7l_target.patch to add_armv6l_and_armv7l_target.patch
+
+---
Old:
add_armv7l_target.patch
New:
add_armv6l_and_armv7l_target.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.syJG96/_old 2018-09-11 17:20:04.003155592 +0200
+++ /var/tmp/diff_new_pack.syJG96/_new 2018-09-11 17:20:04.007155585 +0200
@@ -80,8 +80,8 @@
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Source1:ghc-rpmlintrc
-# PATCH-FIX-UPSTREAM add_armv7l_target.patch - add armv7l target to llvm
targets
-Patch0: add_armv7l_target.patch
+# PATCH-FIX-UPSTREAM add_armv6l_and_armv7l_target.patch - add armv6l and
armv7l target to llvm targets
+Patch0: add_armv6l_and_armv7l_target.patch
# PATCH-FIX-UPSTREAM fix-ppc64le-recognition.patch ptromm...@icloud.com --
Recognize powerpc64le as PPC64 in cabal files.
Patch1: fix-ppc64le-recognition.patch
# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform
++ add_armv6l_and_armv7l_target.patch ++
--- ghc-8.4.3.orig/llvm-targets 2018-09-02 07:51:17.989930822 +0200
+++ ghc-8.4.3/llvm-targets 2018-09-03 16:21:30.155981907 +0200
@@ -4,6 +4,8 @@
,("arm-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s",
"+strict-align"))
,("armv6-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s",
"+strict-align"))
+,("armv6l-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s",
"+strict-align"))
,("armv7-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
+,("armv7l-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
,("aarch64-unknown-linux-gnu",
("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
,("aarch64-unknown-linux",
("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
,("armv7a-unknown-linux-gnueabi",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2018-07-21 10:18:50 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Sat Jul 21 10:18:50 2018 rev:63 rq:623696 version:8.4.3 Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-07-04 23:56:18.275814452 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-07-21 10:21:13.419015242 +0200 @@ -1,0 +2,6 @@ +Wed Jul 18 14:26:09 UTC 2018 - psim...@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +--- @@ -991 +996,0 @@ - Other differences: --
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-07-04 23:56:01
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Wed Jul 4 23:56:01 2018 rev:62 rq:620525 version:8.4.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-06-08 23:14:35.745948696
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-07-04
23:56:18.275814452 +0200
@@ -1,0 +2,11 @@
+Sun Jul 1 11:18:37 UTC 2018 - ptromm...@icloud.com
+
+- Fix dependencies on arm and s390x
+
+---
+Sun Jun 17 10:15:27 UTC 2018 - ptromm...@icloud.com
+
+- add fix-ppc64le-recognition.patch
+* recognize powerpc64le as PPC64 in cabal files
+
+---
New:
fix-ppc64le-recognition.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.hPfQgH/_old 2018-07-04 23:56:19.027813623 +0200
+++ /var/tmp/diff_new_pack.hPfQgH/_new 2018-07-04 23:56:19.027813623 +0200
@@ -82,6 +82,8 @@
Source1:ghc-rpmlintrc
# PATCH-FIX-UPSTREAM add_armv7l_target.patch - add armv7l target to llvm
targets
Patch0: add_armv7l_target.patch
+# PATCH-FIX-UPSTREAM fix-ppc64le-recognition.patch ptromm...@icloud.com --
Recognize powerpc64le as PPC64 in cabal files.
+Patch1: fix-ppc64le-recognition.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.
@@ -138,6 +140,8 @@
%if %with_libnuma
%define libnuma_dep ,libnuma-devel
+%else
+%define libnuma_dep %{nil}
%endif
%if %{defined ghclibdir}
@@ -190,6 +194,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%patch35 -p1
%patch100 -p1
%patch110 -p1
++ fix-ppc64le-recognition.patch ++
Index: ghc-8.4.3/libraries/Cabal/Cabal/Distribution/System.hs
===
--- ghc-8.4.3.orig/libraries/Cabal/Cabal/Distribution/System.hs
+++ ghc-8.4.3/libraries/Cabal/Cabal/Distribution/System.hs
@@ -157,7 +157,7 @@ buildOS = classifyOS Permissive System.I
--
-- The following aliases can also be used:
--* PPC alias: powerpc
---* PPC64 alias : powerpc64
+--* PPC64 alias : powerpc64, powerpc64le
--* Sparc aliases: sparc64, sun4
--* Mips aliases: mipsel, mipseb
--* Arm aliases: armeb, armel
@@ -187,7 +187,7 @@ archAliases :: ClassificationStrictness
archAliases Strict _ = []
archAliases Compat _ = []
archAliases _ PPC = ["powerpc"]
-archAliases _ PPC64 = ["powerpc64"]
+archAliases _ PPC64 = ["powerpc64", "powerpc64le"]
archAliases _ Sparc = ["sparc64", "sun4"]
archAliases _ Mips = ["mipsel", "mipseb"]
archAliases _ Arm = ["armeb", "armel"]
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-06-08 23:14:32
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Fri Jun 8 23:14:32 2018 rev:61 rq:614267 version:8.4.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-06-05 12:53:25.976492251
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-06-08
23:14:35.745948696 +0200
@@ -1,0 +2,15 @@
+Fri Jun 1 13:13:27 UTC 2018 - ptromm...@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 - ptromm...@icloud.com
+
+- Fix build for older openSUSE
+- Don't do selfbootstrapping
+* Cuts down build time roughly in half
+
+---
Old:
ghc-8.4.2-src.tar.xz
New:
ghc-8.4.3-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.2tBaQZ/_old 2018-06-08 23:14:36.897907093 +0200
+++ /var/tmp/diff_new_pack.2tBaQZ/_new 2018-06-08 23:14:36.921906227 +0200
@@ -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: 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: 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 @@
# 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 < mk/build.mk < ghc-8.4.3-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-8.4.2-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new/ghc-8.4.3-src.tar.xz differ: char 26, line 1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2018-06-05 12:53:23
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Tue Jun 5 12:53:23 2018 rev:60 rq:614065 version:8.4.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2018-05-30 12:22:23.719721690
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2018-06-05
12:53:25.976492251 +0200
@@ -1,0 +2,6 @@
+Fri May 18 06:37:11 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Fix armv7 build by adding armv7l to llvm-targets:
+ * add_armv7l_target.patch
+
+---
New:
add_armv7l_target.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.BsIJX3/_old 2018-06-05 12:53:26.868459581 +0200
+++ /var/tmp/diff_new_pack.BsIJX3/_new 2018-06-05 12:53:26.872459435 +0200
@@ -76,6 +76,8 @@
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Source1:ghc-rpmlintrc
+# PATCH-FIX-UPSTREAM add_armv7l_target.patch - add armv7l target to llvm
targets
+Patch0: add_armv7l_target.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.
@@ -184,6 +186,7 @@
%prep
%setup -q
+%patch0 -p1
%patch35 -p1
%patch100 -p1
%patch110 -p1
++ add_armv7l_target.patch ++
--- ghc-8.4.2.orig/llvm-targets 2018-05-17 16:06:42.339933828 +0200
+++ ghc-8.4.2/llvm-targets 2018-05-17 16:06:55.035989908 +0200
@@ -4,6 +4,7 @@
,("arm-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s",
"+strict-align"))
,("armv6-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s",
"+strict-align"))
,("armv7-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
+,("armv7l-unknown-linux-gnueabihf",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
,("aarch64-unknown-linux-gnu",
("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
,("aarch64-unknown-linux",
("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
,("armv7a-unknown-linux-gnueabi",
("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
commit ghc for openSUSE:Factory
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: aarch6
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2017-10-19 19:32:38 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Thu Oct 19 19:32:38 2017 rev:58 rq:534526 version:8.0.2 Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-10-02 16:53:32.144017121 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-10-19 19:32:38.903440142 +0200 @@ -1,0 +2,7 @@ +Tue Oct 17 09:54:11 UTC 2017 - ptromm...@icloud.com + +- add D4089.patch + * fix GHCi issue on ppc64 + * see Haskell Trac #11262 + +--- New: D4089.patch Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.nNiqut/_old 2017-10-19 19:32:39.915392794 +0200 +++ /var/tmp/diff_new_pack.nNiqut/_new 2017-10-19 19:32:39.915392794 +0200 @@ -80,6 +80,8 @@ 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-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 @@ -177,6 +179,7 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 %patch100 -p1 %patch110 -p1 %patch111 -p1 ++ D4089.patch ++ Index: ghc-8.0.2/compiler/ghci/RtClosureInspect.hs === --- ghc-8.0.2.orig/compiler/ghci/RtClosureInspect.hs +++ ghc-8.0.2/compiler/ghci/RtClosureInspect.hs @@ -55,6 +55,7 @@ import TysWiredIn import DynFlags import Outputable as Ppr import GHC.Arr ( Array(..) ) +import GHC.Char import GHC.Exts import GHC.IO ( IO(..) ) @@ -495,7 +496,9 @@ cPprTermBase y = repPrim :: TyCon -> [Word] -> SDoc repPrim t = rep where rep x -| t == charPrimTyCon = text $ show (build x :: Char) +-- Char# uses native machine words, whereas Char's Storable instance uses +-- Int32, so we have to read it as an Int. +| t == charPrimTyCon = text $ show (chr (build x :: Int)) | t == intPrimTyCon = text $ show (build x :: Int) | t == wordPrimTyCon = text $ show (build x :: Word) | t == floatPrimTyCon= text $ show (build x :: Float)
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2017-10-02 16:53:21
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Mon Oct 2 16:53:21 2017 rev:57 rq:529937 version:8.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-09-17 22:40:08.397375575
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-10-02
16:53:32.144017121 +0200
@@ -1,0 +2,11 @@
+Fri Sep 22 07:57:10 UTC 2017 - ptromm...@icloud.com
+
+- add 0001-Use-__atomic-intrinsics-for-atomicread-write.patch
+ * add missing memory barriers on atomic read/write ops
+ * fixes upstream ticket #14244
+- adjust comment for patch 32
+ * the situation with upstream #12537 is improved but not
+solved. Patch 32, however, is correct. There are even more
+memory barriers missing elsewhere in the compiler.
+
+---
New:
0001-Use-__atomic-intrinsics-for-atomicread-write.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.mgKpYP/_old 2017-10-02 16:53:34.287716234 +0200
+++ /var/tmp/diff_new_pack.mgKpYP/_new 2017-10-02 16:53:34.291715672 +0200
@@ -76,8 +76,10 @@
# 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. This also happens
to fix Haskell Trac #12537.
+# 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-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
@@ -174,6 +176,7 @@
%patch30 -p1
%patch31 -p1
%patch32 -p1
+%patch33 -p1
%patch100 -p1
%patch110 -p1
%patch111 -p1
++ 0001-Use-__atomic-intrinsics-for-atomicread-write.patch ++
>From 00d1f097680da6ca718600884794128919dbd87d Mon Sep 17 00:00:00 2001
From: Peter Trommler
Date: Thu, 21 Sep 2017 13:42:58 +0200
Subject: [PATCH] Use __atomic* intrinsics for atomicread/write
---
libraries/ghc-prim/cbits/atomic.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libraries/ghc-prim/cbits/atomic.c
b/libraries/ghc-prim/cbits/atomic.c
index 2ecbf3461a..e679186394 100644
--- a/libraries/ghc-prim/cbits/atomic.c
+++ b/libraries/ghc-prim/cbits/atomic.c
@@ -265,28 +265,28 @@ extern StgWord hs_atomicread8(StgWord x);
StgWord
hs_atomicread8(StgWord x)
{
- return *(volatile StgWord8 *) x;
+ return __atomic_load_n((StgWord8 *) x, __ATOMIC_SEQ_CST);
}
extern StgWord hs_atomicread16(StgWord x);
StgWord
hs_atomicread16(StgWord x)
{
- return *(volatile StgWord16 *) x;
+ return __atomic_load_n((StgWord16 *) x, __ATOMIC_SEQ_CST);
}
extern StgWord hs_atomicread32(StgWord x);
StgWord
hs_atomicread32(StgWord x)
{
- return *(volatile StgWord32 *) x;
+ return __atomic_load_n((StgWord32 *) x, __ATOMIC_SEQ_CST);
}
extern StgWord64 hs_atomicread64(StgWord x);
StgWord64
hs_atomicread64(StgWord x)
{
- return *(volatile StgWord64 *) x;
+ return __atomic_load_n((StgWord64 *) x, __ATOMIC_SEQ_CST);
}
// AtomicWriteByteArrayOp_Int
@@ -295,26 +295,26 @@ extern void hs_atomicwrite8(StgWord x, StgWord val);
void
hs_atomicwrite8(StgWord x, StgWord val)
{
- *(volatile StgWord8 *) x = (StgWord8) val;
+ __atomic_store_n((StgWord8 *) x, (StgWord8) val, __ATOMIC_SEQ_CST);
}
extern void hs_atomicwrite16(StgWord x, StgWord val);
void
hs_atomicwrite16(StgWord x, StgWord val)
{
- *(volatile StgWord16 *) x = (StgWord16) val;
+ __atomic_store_n((StgWord16 *) x, (StgWord16) val, __ATOMIC_SEQ_CST);
}
extern void hs_atomicwrite32(StgWord x, StgWord val);
void
hs_atomicwrite32(StgWord x, StgWord val)
{
- *(volatile StgWord32 *) x = (StgWord32) val;
+ __atomic_store_n((StgWord32 *) x, (StgWord32) val, __ATOMIC_SEQ_CST);
}
extern void hs_atomicwrite64(StgWord x, StgWord
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2017-09-17 22:39:19 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Sun Sep 17 22:39:19 2017 rev:56 rq:526531 version:8.0.2 Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-05-31 12:20:01.681979381 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-09-17 22:40:08.397375575 +0200 @@ -1,0 +2,8 @@ +Sat Sep 16 12:16:30 UTC 2017 - ptromm...@icloud.com + +- add 0001-PPC-Implement-Atomic-operations.patch + * fixes parallel programs on all PowerPC platforms + * uptream ticket #12537 +- refresh buildpath-abi-stability.patch + +--- New: 0001-PPC-Implement-Atomic-operations.patch Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.ScUlQU/_old 2017-09-17 22:40:09.301248490 +0200 +++ /var/tmp/diff_new_pack.ScUlQU/_new 2017-09-17 22:40:09.313246803 +0200 @@ -76,6 +76,8 @@ # 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. This also happens to fix Haskell Trac #12537. +Patch32:0001-PPC-Implement-Atomic-operations.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 @@ -171,6 +173,7 @@ %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 %patch100 -p1 %patch110 -p1 %patch111 -p1 ++ 0001-PPC-Implement-Atomic-operations.patch ++ >From d52808aa474ed9f51981ae35814c0a7ec36b5fea Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 16 Sep 2017 13:52:04 +0200 Subject: [PATCH] PPC: Implement Atomic operations. Fixes #12537 --- compiler/nativeGen/PPC/CodeGen.hs | 91 +++ compiler/nativeGen/PPC/Instr.hs | 47 compiler/nativeGen/PPC/Ppr.hs | 56 3 files changed, 159 insertions(+), 35 deletions(-) diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index df76211f3d..5ec8459926 100644 --- a/compiler/nativeGen/PPC/CodeGen.hs +++ b/compiler/nativeGen/PPC/CodeGen.hs @@ -160,8 +160,8 @@ stmtToInstrs stmt = do -> genCCall target result_regs args CmmBranch id -> genBranch id -CmmCondBranch arg true false _ -> do - b1 <- genCondJump true arg +CmmCondBranch arg true false prediction -> do + b1 <- genCondJump true arg prediction b2 <- genBranch false return (b1 `appOL` b2) CmmSwitch arg ids -> do dflags <- getDynFlags @@ -1069,11 +1069,12 @@ comparison to do. genCondJump :: BlockId -- the branch target -> CmmExpr -- the condition on which to branch +-> Maybe Bool -> NatM InstrBlock -genCondJump id bool = do +genCondJump id bool prediction = do CondCode _ cond code <- getCondCode bool - return (code `snocOL` BCC cond id) + return (code `snocOL` BCC cond id prediction) @@ -1091,6 +1092,78 @@ genCCall :: ForeignTarget-- function to call -> [CmmFormal]-- where to put the result -> [CmmActual]-- arguments (of mixed type) -> NatM InstrBlock +genCCall (PrimTarget (MO_AtomicRMW width amop)) [dst] [addr, n] + = do dflags <- getDynFlags + let platform = targetPlatform dflags + fmt = intFormat width + reg_dst = getRegisterReg platform (CmmLocal dst) + (instr, n_code) <- case amop of +AMO_Add -> getSomeRegOrImm ADD True reg_dst +AMO_Sub -> case n of +CmmLit (CmmInt i _) + | Just imm <- makeImmediate width True (-i) + -> return (ADD reg_dst reg_dst (RIImm imm), nilOL) +_ + -> do + (n_reg, n_code) <- getSomeReg n + return (SUBF reg_dst n_reg reg_dst, n_code) +AMO_And -> getSomeRegOrImm AND False reg_dst +AMO_Nand -> do (n_reg, n_code) <- getSomeReg n + return (NAND reg_dst reg_dst n_reg, n_code) +AMO_Or -> getSomeRegOrImm OR False reg_dst +AMO_Xor -> getSomeRegOrImm XOR False reg_dst + Amode addr_reg ad
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2017-05-31 12:19:10
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Wed May 31 12:19:10 2017 rev:55 rq:498960 version:8.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-05-09 18:06:27.136893220
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-05-31
12:20:01.681979381 +0200
@@ -1,0 +2,8 @@
+Sun May 28 12:52:06 UTC 2017 - mimi...@gmail.com
+
+- make compactible with new upstream macros
+- added patches for more stable abi:
+* buildpath-abi-stability.patch
+* reproducible-tmp-names.patch
+
+---
New:
buildpath-abi-stability.patch
reproducible-tmp-names.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.HU5S9W/_old 2017-05-31 12:20:02.825817911 +0200
+++ /var/tmp/diff_new_pack.HU5S9W/_new 2017-05-31 12:20:02.833816782 +0200
@@ -78,6 +78,10 @@
Patch31: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
@@ -119,30 +123,30 @@
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
-%ghc_lib_subpackage Cabal-1.24.2.0
-%ghc_lib_subpackage array-0.5.1.1
-%ghc_lib_subpackage -c gmp-devel,libffi-devel,libdw-devel,libelf-devel
base-4.9.1.0
-%ghc_lib_subpackage binary-0.8.3.0
-%ghc_lib_subpackage bytestring-0.10.8.1
-%ghc_lib_subpackage containers-0.5.7.1
-%ghc_lib_subpackage deepseq-1.4.2.0
-%ghc_lib_subpackage directory-1.3.0.0
-%ghc_lib_subpackage filepath-1.4.1.1
-%ghc_lib_subpackage -x ghc-%{ghc_version_override}
-%ghc_lib_subpackage ghc-boot-%{ghc_version_override}
-%ghc_lib_subpackage ghc-boot-th-%{ghc_version_override}
-%ghc_lib_subpackage -x ghci-%{ghc_version_override}
-%ghc_lib_subpackage haskeline-0.7.3.0
-%ghc_lib_subpackage hoopl-3.10.2.1
-%ghc_lib_subpackage hpc-0.6.0.3
-%ghc_lib_subpackage pretty-1.1.3.3
-%ghc_lib_subpackage process-1.4.3.0
-%ghc_lib_subpackage template-haskell-2.11.1.0
-%ghc_lib_subpackage -c ncurses-devel terminfo-0.4.0.2
-%ghc_lib_subpackage time-1.6.0.1
-%ghc_lib_subpackage transformers-0.5.2.0
-%ghc_lib_subpackage unix-2.7.2.1
-%ghc_lib_subpackage xhtml-3000.2.1
+%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 -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 -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 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
%endif
%global version %{ghc_version_override}
@@ -168,6 +172,8 @@
%patch30 -p1
%patch31 -p1
%patch100 -p1
+%patch110 -p1
+%patch111 -p1
%build
# Check if bootstrap is required, i.e. version is different from ghc's version
++ buildpath-abi-stability.patch ++
Index: ghc-7.10.1/compiler/iface/MkIface.hs
===
--- ghc-7.10.1.orig/compiler/iface/MkIface.hs 2015-05-17 20:34:02.808643844
+0200
+++ ghc-7.10.1/compiler/iface/MkIface.hs2015-05-17 20:34:02.804643799
+0200
@@ -611,7 +611,7 @@
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
- mi_usages iface0,
+ usages,
sorted_deps,
mi_hpc iface0)
@@ -644,6 +6
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2017-05-09 18:06:21
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Tue May 9 18:06:21 2017 rev:54 rq:493496 version:8.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-02-28 23:50:47.955327720
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-05-09
18:06:27.136893220 +0200
@@ -1,0 +2,10 @@
+Sat May 6 09:02:02 UTC 2017 - meiss...@suse.com
+
+- enable for global PIE support:
+ - the compiler is built without PIE support due to the bootstrap
+libraries being non-PIE using BuildIgnore: gcc-PIE
+ - the compiler itself builds -fPIC objects all the time,
+which should make all ghc compiled binaries be PIE.
+- ghc-pie.patch: enable default -fPIC on Linux/x86_64
+
+---
New:
ghc-pie.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.PEHBiB/_old 2017-05-09 18:06:29.568549599 +0200
+++ /var/tmp/diff_new_pack.PEHBiB/_new 2017-05-09 18:06:29.572549035 +0200
@@ -30,6 +30,8 @@
License:BSD-3-Clause
Group: Development/Languages/Other
ExclusiveArch: aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390 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
@@ -73,6 +75,7 @@
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-OPENSUSE ghc-8.0.2-Cabal-dynlibdir.patch -- Fix shared library
directory location.
Patch100: ghc-8.0.2-Cabal-dynlibdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -163,6 +166,7 @@
%patch28 -p1
%patch29 -p1
%patch30 -p1
+%patch31 -p1
%patch100 -p1
%build
++ ghc-pie.patch ++
Index: ghc-8.0.2/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]
default_PIC platform =
case (platformOS platform, platformArch platform) of
(OSDarwin, ArchX86_64) -> [Opt_PIC]
+(OSLinux, ArchX86_64) -> [Opt_PIC]
(OSOpenBSD, ArchX86_64) -> [Opt_PIC] -- Due to PIE support in
-- OpenBSD since 5.3 release
-- (1 May 2013) we need to
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2017-02-28 23:50:46
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Tue Feb 28 23:50:46 2017 rev:53 rq:459981 version:8.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-01-23 11:41:04.214558709
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-02-28
23:50:47.955327720 +0100
@@ -1,0 +2,25 @@
+Sun Jan 22 11:31:49 UTC 2017 - peter.tromm...@ohm-hochschule.de
+
+- comment for patch 100
+- refresh ghc-no-madv-free.patch with upstream patch
+* upstream fix for Haskell Trac #12865
+* Haskell Trac #12495 is a duplicate
+
+---
+Sat Jan 21 21:50:56 UTC 2017 - mimi...@gmail.com
+
+- update to 8.0.2
+- drop patches merged by upstream:
+* D2495.patch
+- refreshed patches:
+* 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch
+* 0001-StgCmmPrim-Add-missing-write-barrier.patch
+* ghc-no-madv-free.patch
+- added ghc-8.0.2-Cabal-dynlibdir.patch by Jens Petersen simplifing
+haskell packaging
++ Interface files produced by GHC should now be deterministic ( boo#998972 )
++ A bug has been fixed that caused standalone derived Ix instances
+to fail for GADTs with exactly one constructor
++ Compatibility fixes recent Linux distributions.
+
+---
Old:
D2495.patch
ghc-8.0.1-src.tar.xz
New:
ghc-8.0.2-Cabal-dynlibdir.patch
ghc-8.0.2-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.TvxYWL/_old 2017-02-28 23:50:49.123162887 +0100
+++ /var/tmp/diff_new_pack.TvxYWL/_new 2017-02-28 23:50:49.127162323 +0100
@@ -23,7 +23,7 @@
%global unregisterised_archs aarch64 s390 s390x
Name: ghc
-Version:8.0.1
+Version:8.0.2
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Summary:The Glorious Glasgow Haskell Compiler
@@ -67,15 +67,14 @@
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Source1:ghc-rpmlintrc
-# PATCH-FIX-UPSTREAM D2495.patch peter.tromm...@ohm-hochschule.de -- Add
missing memory barrier on mutable variables. See
https://ghc.haskell.org/trac/ghc/ticket/12469 for details. Backport of upstream
fix for ghc 8.0.2.
-Patch27:D2495.patch
# 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 psim...@suse.com -- Fix "unable to
decommit memory: Invalid argument" errors. See
https://ghc.haskell.org/trac/ghc/ticket/12495 for details.
+# 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
-
+# PATCH-FIX-OPENSUSE ghc-8.0.2-Cabal-dynlibdir.patch -- Fix shared library
directory location.
+Patch100: ghc-8.0.2-Cabal-dynlibdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -117,29 +116,29 @@
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
-%ghc_lib_subpackage Cabal-1.24.0.0
+%ghc_lib_subpackage Cabal-1.24.2.0
%ghc_lib_subpackage array-0.5.1.1
-%ghc_lib_subpackage -c gmp-devel,libffi-devel,libdw-devel,libelf-devel
base-4.9.0.0
+%ghc_lib_subpackage -c gmp-devel,libffi-devel,libdw-devel,libelf-devel
base-4.9.1.0
%ghc_lib_subpackage binary-0.8.3.0
%ghc_lib_subpackage bytestring-0.10.8.1
%ghc_lib_subpackage containers-0.5.7.1
%ghc_lib_subpackage deepseq-1.4.2.0
-%ghc_lib_subpackage directory-1.2.6.2
-%ghc_lib_subpackage filepath-1.4.1.0
+%ghc_lib_subpackage directory-1.3.0.0
+%ghc_lib_subpackage filepath-1.4.1.1
%ghc_lib_subpackage -x ghc-%{ghc_version_override}
%ghc_lib_subpackage ghc-boot-%{ghc_version_override}
%ghc_lib_subpackage ghc-boot-th-%{ghc_version_override}
%ghc_lib_subpackage -x ghci-%{ghc_version_override}
-%ghc_lib_subpackage haskeline-0.7.2.3
+%ghc_lib_subpackage haskeline-0.7.3.0
%ghc_lib_subpackage hoopl-3.10.2.1
%ghc_lib_subpackage hpc-0.6.0.3
%ghc_lib_subpackage pretty-1.1.3.3
-%ghc_
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2017-01-23 11:41:01
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-01-18 21:43:51.571161516
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-01-23
11:41:04.214558709 +0100
@@ -1,0 +2,7 @@
+Fri Jan 20 08:39:45 UTC 2017 - peter.tromm...@ohm-hochschule.de
+
+- drop D2844.patch
+ * the patch causes more issues with parallel builds
+- fixes boo#1020909
+
+---
Old:
D2844.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.ylzDfR/_old 2017-01-23 11:41:05.014445253 +0100
+++ /var/tmp/diff_new_pack.ylzDfR/_new 2017-01-23 11:41:05.018444686 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -67,8 +67,6 @@
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Source1:ghc-rpmlintrc
-# PATCH-FIX-UPSTREAM D2844.patch peter.tromm...@ohm-hochschule.de -- Use full
range of machine word in UniqSupply. Fixes issues with parallel builds.
Backport of upstream patch. See Haskell Trac #12899.
-Patch1: D2844.patch
# PATCH-FIX-UPSTREAM D2495.patch peter.tromm...@ohm-hochschule.de -- Add
missing memory barrier on mutable variables. See
https://ghc.haskell.org/trac/ghc/ticket/12469 for details. Backport of upstream
fix for ghc 8.0.2.
Patch27:D2495.patch
# PATCH-FIX_UPSTREAM 0001-StgCmmPrim-Add-missing-write-barrier.patch
peter.tromm...@ohm-hochschule.de -- Add missing write barrier on mutable arrays.
@@ -163,7 +161,6 @@
%prep
%setup -q
-%patch1 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2017-01-18 21:43:49
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-10-19 13:14:34.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-01-18
21:43:51.571161516 +0100
@@ -1,0 +2,6 @@
+Fri Dec 16 08:45:26 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- add D2844.patch
+ * fix issues with parallel builds
+
+---
New:
D2844.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.XCiEkX/_old 2017-01-18 21:43:52.463035366 +0100
+++ /var/tmp/diff_new_pack.XCiEkX/_new 2017-01-18 21:43:52.471034235 +0100
@@ -67,6 +67,8 @@
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Source1:ghc-rpmlintrc
+# PATCH-FIX-UPSTREAM D2844.patch peter.tromm...@ohm-hochschule.de -- Use full
range of machine word in UniqSupply. Fixes issues with parallel builds.
Backport of upstream patch. See Haskell Trac #12899.
+Patch1: D2844.patch
# PATCH-FIX-UPSTREAM D2495.patch peter.tromm...@ohm-hochschule.de -- Add
missing memory barrier on mutable variables. See
https://ghc.haskell.org/trac/ghc/ticket/12469 for details. Backport of upstream
fix for ghc 8.0.2.
Patch27:D2495.patch
# PATCH-FIX_UPSTREAM 0001-StgCmmPrim-Add-missing-write-barrier.patch
peter.tromm...@ohm-hochschule.de -- Add missing write barrier on mutable arrays.
@@ -161,6 +163,7 @@
%prep
%setup -q
+%patch1 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
++ D2844.patch ++
Index: ghc-8.0.1/compiler/Unique.h
===
--- /dev/null
+++ ghc-8.0.1/compiler/Unique.h
@@ -0,0 +1,3 @@
+#include "../includes/MachDeps.h"
+
+#define UNIQUE_BITS (WORD_SIZE_IN_BITS - 8)
Index: ghc-8.0.1/compiler/basicTypes/UniqSupply.hs
===
--- ghc-8.0.1.orig/compiler/basicTypes/UniqSupply.hs
+++ ghc-8.0.1/compiler/basicTypes/UniqSupply.hs
@@ -3,7 +3,7 @@
(c) The GRASP/AQUA Project, Glasgow University, 1992-1998
-}
-{-# LANGUAGE UnboxedTuples #-}
+{-# LANGUAGE CPP, UnboxedTuples #-}
module UniqSupply (
-- * Main data type
@@ -38,6 +38,8 @@ import Control.Monad
import Data.Bits
import Data.Char
+#include "Unique.h"
+
{-
* *
@@ -73,7 +75,7 @@ takeUniqFromSupply :: UniqSupply -> (Uni
-- ^ Obtain the 'Unique' from this particular 'UniqSupply', and a new supply
mkSplitUniqSupply c
- = case ord c `shiftL` 24 of
+ = case ord c `shiftL` UNIQUE_BITS of
mask -> let
-- here comes THE MAGIC:
Index: ghc-8.0.1/compiler/basicTypes/Unique.hs
===
--- ghc-8.0.1.orig/compiler/basicTypes/Unique.hs
+++ ghc-8.0.1/compiler/basicTypes/Unique.hs
@@ -8,6 +8,7 @@
comparison key in the compiler.
If there is any single operation that needs to be fast, it is @Unique@
+
comparison. Unsurprisingly, there is quite a bit of huff-and-puff
directed to that end.
@@ -62,6 +63,7 @@ module Unique (
) where
#include "HsVersions.h"
+#include "Unique.h"
import BasicTypes
import FastString
@@ -123,6 +125,11 @@ deriveUnique (MkUnique i) delta = mkUniq
-- newTagUnique changes the "domain" of a unique to a different char
newTagUnique u c = mkUnique c i where (_,i) = unpkUnique u
+-- | How many bits are devoted to the unique index (as opposed to the class
+-- character).
+uniqueMask :: Int
+uniqueMask = (1 `shiftL` UNIQUE_BITS) - 1
+
-- pop the Char in the top 8 bits of the Unique(Supply)
-- No 64-bit bugs here, as long as we have at least 32 bits. --JSM
@@ -135,15 +142,15 @@ mkUnique :: Char -> Int -> Unique
mkUnique c i
= MkUnique (tag .|. bits)
where
-tag = ord c `shiftL` 24
-bits = i .&. 16777215 {-``0x00ff''-}
+tag = ord c `shiftL` UNIQUE_BITS
+bits = i .&. uniqueMask
unpkUnique (MkUnique u)
= let
-- as long as the Char may have its eighth bit set, we
-- really do need the logical right-shift here!
-tag = chr (u `shiftR` 24)
-i = u .&. 16777215 {-``0x00ff''-}
+tag = chr (u `shiftR` UNIQUE_BITS)
+i = u .&. uniqueMask
in
(tag, i)
Index: ghc-8.0.1/compiler/cbits/genSym.c
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-10-19 13:13:49
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-09-30 15:33:10.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-10-19
13:14:34.0 +0200
@@ -1,0 +2,36 @@
+Fri Oct 14 20:34:46 UTC 2016 - mimi...@gmail.com
+
+- make compatible with new ghc-rpm-macros
+
+---
+Wed Sep 28 14:16:09 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- update to 8.0.1
+- drop patches fixed upstream:
+* drop atomic-cast.patch
+* drop cabal-show-detail-direct.patch
+* drop 0001-link-command-line-libs-to-temp-so.patch
+* drop 0001-implement-native-code-generator-for-ppc64.patch
+* drop ghc.git-b29f20.patch
+* drop u_terminfo_0402.patch
+* drop u_Cabal_update.patch
+* drop u_haskeline_update.patch
+* drop 0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch
+* drop D2214.patch
+* drop D2225.patch
+- refresh 0001-StgCmmPrim-Add-missing-write-barrier.patch
+- refresh 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch
+- add ghc-no-madv-free.patch to fix "unable to decommit memory:
+ Invalid argument" errors GHC reports due to a misdetected
+ MADV_FREE capability. The configure script sees the symbol define
+ by glibc, but unfortunately this doesn't mean that the running
+ kernel actually supports the feature, too. The upstream ticket
+ https://ghc.haskell.org/trac/ghc/ticket/12495 has more details.
+ Thanks to @psimons
+- GHC produces debug information on x86 and x86_64
+- aarch64 has LLVM backend (requires llvm-3.7)
+- native code generator for powerpc64[le] (openSUSE contribution!)
+- disable html doc on SLE, we don't have python-sphinx
+* Thanks @mimi_vx
+
+---
Old:
0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch
0001-implement-native-code-generator-for-ppc64.patch
0001-link-command-line-libs-to-temp-so.patch
D2214.patch
D2225.patch
atomic-cast.patch
cabal-show-detail-direct.patch
ghc-7.10.3b-src.tar.xz
ghc.git-b29f20.patch
u_Cabal_update.patch
u_haskeline_update.patch
u_terminfo_0402.patch
New:
ghc-8.0.1-src.tar.xz
ghc-no-madv-free.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.WclYjX/_old 2016-10-19 13:14:38.0 +0200
+++ /var/tmp/diff_new_pack.WclYjX/_new 2016-10-19 13:14:38.0 +0200
@@ -16,22 +16,27 @@
#
+%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
+%define without_manual 1
+%endif
+
%global unregisterised_archs aarch64 s390 s390x
Name: ghc
-Version:7.10.3
+Version:8.0.1
Release:0
-Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
+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
BuildRequires: binutils-devel
BuildRequires: gcc
-BuildRequires: ghc-bootstrap >= 7.6
+BuildRequires: ghc-bootstrap >= 7.8
BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
+BuildRequires: libdw-devel
BuildRequires: libelf-devel
#Fix for openSUSE:Leap:42.1
%if 0%{?suse_version} == 1315
@@ -39,59 +44,35 @@
%else
BuildRequires: libffi-devel
%endif
-#TODO ghc-7.10.2 supports only llvm-3.5, need talk with llvm packagers about
+%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
-#%%ifnarch ppc aarch64
+# 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: ncurses-devel
BuildRequires: pkg-config
BuildRequires: xz
%if %{undefined without_manual}
-BuildRequires: docbook-utils
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: libxslt
+BuildRequires: python-sphinx
%endif
-%ifarch aarch64
-BuildRequires: binutils-gold
-%endif
-
-# Patch 19 changes build system
-BuildRequires: autoconf
-BuildRequires: automake
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}-%{versi
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-09-30 15:33:03
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-08-22 10:07:18.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-09-30
15:33:10.0 +0200
@@ -1,0 +2,11 @@
+Tue Sep 27 11:53:54 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- add D2495.patch
+* missing memory barrier on PowerPC, ARM
+- add 0001-StgCmmPrim-Add-missing-write-barrier.patch
+* another issing memory barrier on PowerPC, ARM
+- add 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch
+* fix bug in code generator
+* fixes build of ghc-zeromq4-haskell on powerpc64[le]
+
+---
New:
0001-PPC-CodeGen-fix-lwa-instruction-generation.patch
0001-StgCmmPrim-Add-missing-write-barrier.patch
D2495.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.PPPE4X/_old 2016-09-30 15:33:14.0 +0200
+++ /var/tmp/diff_new_pack.PPPE4X/_new 2016-09-30 15:33:14.0 +0200
@@ -88,6 +88,12 @@
Patch25:D2214.patch
# PATCH-FIX-UPSTREAM D2225.patch peter.tromm...@ohm-hochschule.de -- Fix SMP
imlementation in Haskell runtime on PPC[64[le]]. Backport of upstreamed patch.
See Haskell trac #12070 and https://phabricator.haskell.org/D2225 for details.
Patch26:D2225.patch
+# PATCH-FIX-UPSTREAM D2495.patch peter.tromm...@ohm-hochschule.de -- Add
missing memory barrier on mutable variables. See
https://ghc.haskell.org/trac/ghc/ticket/12469 for details. Backport of upstream
fix for ghc 8.0.2.
+Patch27:D2495.patch
+# 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 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -188,6 +194,9 @@
%patch24 -p1
%patch25 -p1
%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch30 -p1
%build
# Patch 19 modifies build system
++ 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch ++
>From ff48b3e3fd90e0328921f5e86460aba3ff217002 Mon Sep 17 00:00:00 2001
From: Peter Trommler
Date: Mon, 25 Jan 2016 20:32:44 +0100
Subject: [PATCH] PPC/CodeGen: fix lwa instruction generation
---
compiler/nativeGen/PPC/CodeGen.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: ghc-7.10.3/compiler/nativeGen/PPC/CodeGen.hs
===
--- ghc-7.10.3.orig/compiler/nativeGen/PPC/CodeGen.hs
+++ ghc-7.10.3/compiler/nativeGen/PPC/CodeGen.hs
@@ -464,7 +464,7 @@ getRegister' _ (CmmMachOp (MO_UU_Conv W3
return (Any II64 (\dst -> addr_code `snocOL` LD II32 dst addr))
getRegister' _ (CmmMachOp (MO_SS_Conv W32 W64) [CmmLoad mem _]) = do
-Amode addr addr_code <- getAmode D mem
+Amode addr addr_code <- getAmode DS mem -- lwa is DS-form
return (Any II64 (\dst -> addr_code `snocOL` LA II32 dst addr))
getRegister' dflags (CmmMachOp mop [x]) -- unary MachOps
++ 0001-StgCmmPrim-Add-missing-write-barrier.patch ++
>From ca2e649101f250e444b4ac7c5204d28f236660e6 Mon Sep 17 00:00:00 2001
From: Peter Trommler
Date: Fri, 9 Sep 2016 10:55:58 +0200
Subject: [PATCH] StgCmmPrim: Add missing write barrier.
---
compiler/codeGen/StgCmmPrim.hs | 1 +
1 file changed, 1 insertion(+)
Index: ghc-7.10.3/compiler/codeGen/StgCmmPrim.hs
===
--- ghc-7.10.3.orig/compiler/codeGen/StgCmmPrim.hs
+++ ghc-7.10.3/compiler/codeGen/StgCmmPrim.hs
@@ -1324,6 +1324,7 @@ doWritePtrArrayOp addr idx val
emit (setInfo addr (CmmLit (CmmLabel mkMAP_DIRTY_infoLabel)))
-- the write barrier. We must write a byte into the mark table:
-- bits8[a + header_size + StgMutArrPtrs_size(a) + x >> N]
+ emitPrimCall [] MO_WriteBarrier []
emit $ mkStore (
cmmOffsetExpr dflags
(cmmOffsetExprW dflags (cmmOffsetB dflags addr (arrPtrsHdrSize
dflags))
++ D2495.patch ++
Index: ghc-8.0.1/compiler/codeGen/StgCmmPrim.hs
===
--- ghc-8.0.1.orig/compiler/codeGen/StgCmmPrim.hs
+++ ghc-8.0.1/compiler/codeGen/StgCmmPrim.hs
@@ -310,8 +310,11 @@ emitPrimOp _ [res] GetCurrentCCSOp [_
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-08-22 10:07:15
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-05-23 16:39:59.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-08-22
10:07:18.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 18 17:39:47 UTC 2016 - mimi...@gmail.com
+
+- fix boo#994268
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.q6W1uV/_old 2016-08-22 10:07:19.0 +0200
+++ /var/tmp/diff_new_pack.q6W1uV/_new 2016-08-22 10:07:19.0 +0200
@@ -368,13 +368,13 @@
# groups under a single name 'runhaskell'. Either these tools should be
# disentangled from the Haskell implementations or all implementations should
# have the same set of tools. *sigh*
-"%{_sbindir}/update-alternatives" --install %{_bindir}/runhaskell runhaskell
%{_bindir}/runghc 500
-"%{_sbindir}/update-alternatives" --install %{_bindir}/hsc2hs hsc2hs
%{_bindir}/hsc2hs-ghc 500
+%{_sbindir}/update-alternatives --install %{_bindir}/runhaskell runhaskell
%{_bindir}/runghc 500
+%{_sbindir}/update-alternatives --install %{_bindir}/hsc2hs hsc2hs
%{_bindir}/hsc2hs-ghc 500
%preun compiler
if test "$1" = 0; then
- "%{_sbindir}/update-alternatives" --remove runhaskell %{_bindir}/runghc
- "%{_sbindir}/update-alternatives" --remove hsc2hs %{_bindir}/hsc2hs-ghc
+ %{_sbindir}/update-alternatives --remove runhaskell %{_bindir}/runghc
+ %{_sbindir}/update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc
fi
%files
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-05-23 16:39:50
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-05-17 17:15:38.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-05-23
16:39:59.0 +0200
@@ -1,0 +2,7 @@
+Tue May 17 19:01:13 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- add D2225.patch
+* backport of upstream patch accepted for ghc 8.0.1
+* fix SMP primitives on all powerpc archs
+
+---
New:
D2225.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.SvUoXr/_old 2016-05-23 16:40:01.0 +0200
+++ /var/tmp/diff_new_pack.SvUoXr/_new 2016-05-23 16:40:01.0 +0200
@@ -86,6 +86,8 @@
Patch24:0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch
# PATCH-FIX-UPSTREAM D2214.patch peter.tromm...@ohm-hochschule.de -- Fix
PowerPC code generator. See Haskell Trac #12054 and
https://phabricator.haskell.org/D2214 for details.
Patch25:D2214.patch
+# PATCH-FIX-UPSTREAM D2225.patch peter.tromm...@ohm-hochschule.de -- Fix SMP
imlementation in Haskell runtime on PPC[64[le]]. Backport of upstreamed patch.
See Haskell trac #12070 and https://phabricator.haskell.org/D2225 for details.
+Patch26:D2225.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -185,6 +187,7 @@
%patch23 -p2
%patch24 -p1
%patch25 -p1
+%patch26 -p1
%build
# Patch 19 modifies build system
++ D2225.patch ++
Index: ghc-7.10.3/includes/stg/SMP.h
===
--- ghc-7.10.3.orig/includes/stg/SMP.h
+++ ghc-7.10.3/includes/stg/SMP.h
@@ -119,22 +119,8 @@ xchg(StgPtr p, StgWord w)
:"+r" (result), "+m" (*p)
: /* no input-only operands */
);
-#elif powerpc_HOST_ARCH
-__asm__ __volatile__ (
-"1: lwarx %0, 0, %2\n"
-" stwcx.%1, 0, %2\n"
-" bne- 1b"
-:"=&r" (result)
-:"r" (w), "r" (p)
-);
-#elif powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
-__asm__ __volatile__ (
-"1: ldarx %0, 0, %2\n"
-" stdcx.%1, 0, %2\n"
-" bne- 1b"
-:"=&r" (result)
-:"r" (w), "r" (p)
-);
+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
+result = __sync_lock_test_and_set(p, w);
#elif sparc_HOST_ARCH
result = w;
__asm__ __volatile__ (
@@ -202,34 +188,8 @@ cas(StgVolatilePtr p, StgWord o, StgWord
:"=a"(o), "+m" (*(volatile unsigned int *)p)
:"0" (o), "r" (n));
return o;
-#elif powerpc_HOST_ARCH
-StgWord result;
-__asm__ __volatile__ (
-"1: lwarx %0, 0, %3\n"
-" cmpw %0, %1\n"
-" bne 2f\n"
-" stwcx.%2, 0, %3\n"
-" bne- 1b\n"
-"2:"
-:"=&r" (result)
-:"r" (o), "r" (n), "r" (p)
-:"cc", "memory"
-);
-return result;
-#elif powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
-StgWord result;
-__asm__ __volatile__ (
-"1: ldarx %0, 0, %3\n"
-" cmpd %0, %1\n"
-" bne 2f\n"
-" stdcx.%2, 0, %3\n"
-" bne- 1b\n"
-"2:"
-:"=&r" (result)
-:"r" (o), "r" (n), "r" (p)
-:"cc", "memory"
-);
-return result;
+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
+return __sync_val_compare_and_swap(p, o, n);
#elif sparc_HOST_ARCH
__asm__ __volatile__ (
"cas [%1], %2, %0"
@@ -290,6 +250,7 @@ cas(StgVolatilePtr p, StgWord o, StgWord
// RRN: Generalized to arbitrary increments to enable fetch-and-add in
// Haskell code (fetchAddIntArray#).
+// PT: add-and-fetch, returns new value
EXTERN_INLINE StgWord
atomic_inc(StgVolatilePtr p, StgWord incr)
{
@@ -301,6 +262,8 @@ atomic_inc(StgVolatilePtr p, StgWord inc
"+r" (r), "+m" (*p):
);
return r + incr;
+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
+return __sync_add_and_fetch(p, incr);
#else
StgWord old, new_;
do {
@@ -322,6 +285,8 @@ atomic_dec(StgVolatilePtr p)
"+r" (r), "+m" (*p):
);
return r-1;
+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
+return __sync_sub_and_fetch(p, (StgWord) 1);
#else
StgWord old, new_;
do {
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-05-17 17:15:36
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-04-30 23:30:22.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-05-17
17:15:38.0 +0200
@@ -1,0 +2,11 @@
+Sat May 14 09:13:07 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- add D2214.patch
+* backport of upstream patch slated for ghc 8.0.2
+* fix issue in code PowerPC code generator (32 bit and 64 bit)
+- add 0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch
+* backport of upstream fix slated for ghc 8.0.2
+* fix bytestring library on big-endian archs
+* fix wrong results in ghc-pureMD5 and others on big-endian
+
+---
New:
0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch
D2214.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.YtjYiq/_old 2016-05-17 17:15:39.0 +0200
+++ /var/tmp/diff_new_pack.YtjYiq/_new 2016-05-17 17:15:39.0 +0200
@@ -82,6 +82,11 @@
Patch22:u_Cabal_update.patch
# PATCH-FIX-UPSTREAM u_haskeline_update.patch mimi...@gmail.com -- update
haskeline to 0.7.2.3
Patch23:u_haskeline_update.patch
+# PATCH-FIX-UPSTREAM 0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch
peter.tromm...@ohm-hochschule.de -- Fix ghc-pureMD5 and other Haskell packages
on big-endian architectures.
+Patch24:0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch
+# PATCH-FIX-UPSTREAM D2214.patch peter.tromm...@ohm-hochschule.de -- Fix
PowerPC code generator. See Haskell Trac #12054 and
https://phabricator.haskell.org/D2214 for details.
+Patch25:D2214.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -178,6 +183,8 @@
%patch21 -p2
%patch22 -p2
%patch23 -p2
+%patch24 -p1
+%patch25 -p1
%build
# Patch 19 modifies build system
++ 0001-Fix-misspelled-WORDS_BIGENDIAN-macro.patch ++
>From 4f52849a99753fab63d634769dd35a31f4d5a1b2 Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel
Date: Thu, 12 May 2016 20:36:34 +0200
Subject: [PATCH] Fix misspelled WORDS_BIGENDIAN macro
This was causing word{16,32,64}{le,be} primitives to break
on big endian archs (such as `powerpc`/`powerpc64`) with
serious consequences such as
https://github.com/TomMD/pureMD5/issues/5
---
Data/ByteString/Builder/Prim/Binary.hs | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Index: ghc-8.0.1/libraries/bytestring/Data/ByteString/Builder/Prim/Binary.hs
===
--- ghc-8.0.1.orig/libraries/bytestring/Data/ByteString/Builder/Prim/Binary.hs
+++ ghc-8.0.1/libraries/bytestring/Data/ByteString/Builder/Prim/Binary.hs
@@ -83,7 +83,7 @@ word8 = storableToF
-- | Encoding 'Word16's in big endian format.
{-# INLINE word16BE #-}
word16BE :: FixedPrim Word16
-#ifdef WORD_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
word16BE = word16Host
#else
word16BE = fixedPrim 2 $ \w p -> do
@@ -94,7 +94,7 @@ word16BE = fixedPrim 2 $ \w p -> do
-- | Encoding 'Word16's in little endian format.
{-# INLINE word16LE #-}
word16LE :: FixedPrim Word16
-#ifdef WORD_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
word16LE = fixedPrim 2 $ \w p -> do
poke p (fromIntegral (w) :: Word8)
poke (p `plusPtr` 1) (fromIntegral (shiftr_w16 w 8) :: Word8)
@@ -105,7 +105,7 @@ word16LE = word16Host
-- | Encoding 'Word32's in big endian format.
{-# INLINE word32BE #-}
word32BE :: FixedPrim Word32
-#ifdef WORD_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
word32BE = word32Host
#else
word32BE = fixedPrim 4 $ \w p -> do
@@ -118,7 +118,7 @@ word32BE = fixedPrim 4 $ \w p -> do
-- | Encoding 'Word32's in little endian format.
{-# INLINE word32LE #-}
word32LE :: FixedPrim Word32
-#ifdef WORD_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
word32LE = fixedPrim 4 $ \w p -> do
poke p (fromIntegral (w) :: Word8)
poke (p `plusPtr` 1) (fromIntegral (shiftr_w32 w 8) :: Word8)
@@ -134,7 +134,7 @@ word32LE = word32Host
-- | Encoding 'Word64's in big endian format.
{-# INLINE word64BE #-}
word64BE :: FixedPrim Word64
-#ifdef WORD_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
word64BE = word64Host
#else
#if WORD_SIZE_IN_BITS < 64
@@ -170,7 +170,7 @@ word64BE = fixedPrim 8 $ \w p -> do
-- | Encoding 'Word64's in little endian format.
{-# INLINE word64LE #-}
word64LE :: FixedPrim Word64
-#ifdef WORD_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
#if WORD_SIZE_IN_BITS < 64
word64LE =
fixedPrim 8 $ \w p -> do
++ D2214.patch ++
Index: ghc-7.10.3/com
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-04-30 23:30:20
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-03-16 10:33:53.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-04-30
23:30:22.0 +0200
@@ -1,0 +2,9 @@
+Tue Apr 19 12:50:38 UTC 2016 - mimi...@gmail.com
+
+- update haskeline to 0.7.2.3
+- refresh u_haskeline_update.patch
+* Fix hsc2hs-related warning on ghc-8
+* Fix the behavior of ctrl-W in the emacs bindings
+* Point to github instead of trac
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.2gxAiC/_old 2016-04-30 23:30:23.0 +0200
+++ /var/tmp/diff_new_pack.2gxAiC/_new 2016-04-30 23:30:23.0 +0200
@@ -80,7 +80,7 @@
Patch21:u_terminfo_0402.patch
# PATCH-FIX-UPSTREAM u_Cabal_update.patch mimi...@gmail.com -- update Cabal to
1.22.6.0
Patch22:u_Cabal_update.patch
-# PATCH-FIX-UPSTREAM u_haskeline_update.patch mimi...@gmail.com -- update
haskeline to 0.7.2.2
+# PATCH-FIX-UPSTREAM u_haskeline_update.patch mimi...@gmail.com -- update
haskeline to 0.7.2.3
Patch23:u_haskeline_update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -139,7 +139,7 @@
%define ghc_pkg_obsoletes ghc-bin-package-db-devel < 0.0.0.0-%{release}
%ghc_lib_subpackage -x ghc %{ghc_version_override}
%undefine ghc_pkg_obsoletes
-%ghc_lib_subpackage haskeline 0.7.2.2
+%ghc_lib_subpackage haskeline 0.7.2.3
%ghc_lib_subpackage hoopl 3.10.0.2
%ghc_lib_subpackage hpc 0.6.0.2
%ghc_lib_subpackage pretty 1.1.2.0
++ u_haskeline_update.patch ++
1227 lines (skipped)
between /work/SRC/openSUSE:Factory/ghc/u_haskeline_update.patch
and /work/SRC/openSUSE:Factory/.ghc.new/u_haskeline_update.patch
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-03-16 10:33:51
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-02-22 08:57:38.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-03-16
10:33:53.0 +0100
@@ -1,0 +2,9 @@
+Tue Mar 8 08:56:42 UTC 2016 - mimi...@gmail.com
+
+- update Cabal to 1.22.8.0
+- refresh u_Cabal_update.patch
+* Distribution.Simple.Setup: remove job cap
+* Check all object file suffixes for recompilation
+* Move source files under 'src/'.
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.tSywtL/_old 2016-03-16 10:33:55.0 +0100
+++ /var/tmp/diff_new_pack.tSywtL/_new 2016-03-16 10:33:55.0 +0100
@@ -127,7 +127,7 @@
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
-%ghc_lib_subpackage Cabal 1.22.7.0
+%ghc_lib_subpackage Cabal 1.22.8.0
%ghc_lib_subpackage array 0.5.1.0
%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.8.2.0
%ghc_lib_subpackage binary 0.7.5.0
++ u_Cabal_update.patch ++
--- /var/tmp/diff_new_pack.tSywtL/_old 2016-03-16 10:33:55.0 +0100
+++ /var/tmp/diff_new_pack.tSywtL/_new 2016-03-16 10:33:55.0 +0100
@@ -1,11 +1,11 @@
-diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
-index b498ca0..bf64bd5 100644
a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
+diff --git a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Cabal.cabal
b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
+index b498ca0..e8bfb00 100644
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Cabal.cabal
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
@@ -1,5 +1,5 @@
name: Cabal
-version: 1.22.5.0
-+version: 1.22.7.0
++version: 1.22.8.0
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
@@ -45,11 +45,29 @@
Cabal,
process,
directory,
-diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-index 444c851..270e2c3 100644
a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+diff --git a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+index 444c851..fa6d8a8 100644
+--- a/ghc-7.10.3.orig/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-@@ -553,8 +553,10 @@ buildOrReplLib forRepl verbosity numJobs pkg_descr lbi
lib clbi = do
+@@ -542,19 +542,22 @@ buildOrReplLib forRepl verbosity numJobs pkg_descr lbi
lib clbi = do
+}
+odir = fromFlag (ghcOptObjDir vanillaCcOpts)
+createDirectoryIfMissingVerbose verbosity True odir
+- needsRecomp <- checkNeedsRecompilation filename vanillaCcOpts
+- when needsRecomp $ do
+- runGhcProg vanillaCcOpts
+- unless forRepl $
+- whenSharedLib forceSharedLib (runGhcProg sharedCcOpts)
+- unless forRepl $ whenProfLib (runGhcProg profCcOpts)
++ let runGhcProgIfNeeded ccOpts = do
++ needsRecomp <- checkNeedsRecompilation filename ccOpts
++ when needsRecomp $ runGhcProg ccOpts
++ runGhcProgIfNeeded vanillaCcOpts
++ unless forRepl $
++ whenSharedLib forceSharedLib (runGhcProgIfNeeded sharedCcOpts)
++ unless forRepl $ whenProfLib (runGhcProgIfNeeded profCcOpts)
+ | filename <- cSources libBi]
+
-- TODO: problem here is we need the .c files built first, so we can load
them
-- with ghci, but .c files can depend on .h files generated by ghc by ffi
-- exports.
@@ -62,7 +80,7 @@
-- link:
unless forRepl $ do
-@@ -766,7 +768,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
+@@ -766,7 +769,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
ghcOptLinkLibPath= toNubListR $ extraLibDirs exeBi,
ghcOptLinkFrameworks = toNubListR $ PD.frameworks exeBi,
ghcOptInputFiles = toNubListR
@@ -73,7 +91,7 @@
ghcOptRPaths = rpaths
}
replOpts = baseOpts {
-@@ -812,9 +816,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
+@@ -812,9 +817,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_desc
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-02-22 08:57:28
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-02-17 12:11:31.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-02-22
08:57:38.0 +0100
@@ -1,0 +2,6 @@
+Wed Feb 17 09:09:17 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- limit parallel jobs to two on aarch64
+* aarch64 runs out of memory with too many parallel compiles
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.eoEszO/_old 2016-02-22 08:57:39.0 +0100
+++ /var/tmp/diff_new_pack.eoEszO/_new 2016-02-22 08:57:39.0 +0100
@@ -210,7 +210,7 @@
HSCOLOUR_SRCS= NO
EOF
./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi
-%ifnarch s390 s390x
+%ifnarch aarch64 s390 s390x
make %{?_smp_mflags}
%else
make -j 2
@@ -265,7 +265,7 @@
%{?ghc_boot:--with-ghc=%{_builddir}/ghc-boot/bin/ghc} \
--with-system-libffi
-%ifnarch s390 s390x
+%ifnarch aarch64 s390 s390x
make %{?_smp_mflags}
%else
make -j 2
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2016-02-17 10:26:00 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-02-08 09:48:40.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-02-17 12:11:31.0 +0100 @@ -1,0 +2,5 @@ +Sun Feb 14 13:55:46 UTC 2016 - peter.tromm...@ohm-hochschule.de + +- add missing C library dependency to terminfo devel package + +--- Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.s3cQtF/_old 2016-02-17 12:11:33.0 +0100 +++ /var/tmp/diff_new_pack.s3cQtF/_new 2016-02-17 12:11:33.0 +0100 @@ -145,7 +145,7 @@ %ghc_lib_subpackage pretty 1.1.2.0 %ghc_lib_subpackage process 1.2.3.0 %ghc_lib_subpackage template-haskell 2.10.0.0 -%ghc_lib_subpackage terminfo 0.4.0.2 +%ghc_lib_subpackage -c ncurses-devel terminfo 0.4.0.2 %ghc_lib_subpackage time 1.5.0.1 %ghc_lib_subpackage transformers 0.4.2.0 %ghc_lib_subpackage unix 2.7.1.0
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-02-08 09:48:19
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-01-28 17:25:06.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-02-08
09:48:40.0 +0100
@@ -1,0 +2,10 @@
+Sun Feb 7 00:33:26 UTC 2016 - mimi...@gmail.com
+
+- update haskeline to 0.7.2.2
+- add u_haskeline_update.patch
+* canonicalize AMP instances to make the code more future proof
+* Generalize constraints for InputT instances
+* Bump upper bounds on base and transformers
+* Make Haskeline `-Wtabs` clean
+
+---
New:
u_haskeline_update.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.oG4KEn/_old 2016-02-08 09:48:41.0 +0100
+++ /var/tmp/diff_new_pack.oG4KEn/_new 2016-02-08 09:48:41.0 +0100
@@ -80,6 +80,8 @@
Patch21:u_terminfo_0402.patch
# PATCH-FIX-UPSTREAM u_Cabal_update.patch mimi...@gmail.com -- update Cabal to
1.22.6.0
Patch22:u_Cabal_update.patch
+# PATCH-FIX-UPSTREAM u_haskeline_update.patch mimi...@gmail.com -- update
haskeline to 0.7.2.2
+Patch23:u_haskeline_update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -137,7 +139,7 @@
%define ghc_pkg_obsoletes ghc-bin-package-db-devel < 0.0.0.0-%{release}
%ghc_lib_subpackage -x ghc %{ghc_version_override}
%undefine ghc_pkg_obsoletes
-%ghc_lib_subpackage haskeline 0.7.2.1
+%ghc_lib_subpackage haskeline 0.7.2.2
%ghc_lib_subpackage hoopl 3.10.0.2
%ghc_lib_subpackage hpc 0.6.0.2
%ghc_lib_subpackage pretty 1.1.2.0
@@ -175,6 +177,7 @@
%patch20 -p1
%patch21 -p2
%patch22 -p2
+%patch23 -p2
%build
# Patch 19 modifies build system
++ u_haskeline_update.patch ++
diff --git a/ghc-7.10.3.old/libraries/haskeline/Changelog
b/ghc-7.10.3/libraries/haskeline/Changelog
index 5cb7cc5..e559185 100644
--- a/ghc-7.10.3.old/libraries/haskeline/Changelog
+++ b/ghc-7.10.3/libraries/haskeline/Changelog
@@ -1,3 +1,10 @@
+Changed in version 0.7.2.2:
+ * Fix Linux to Windows cross-compile
+ * Canonicalize AMP instances to make the code more future proof
+ * Generalize constraints for InputT instances
+ * Bump upper bounds on base and transformers
+ * Make Haskeline `-Wtabs` clean
+
Changed in version 0.7.2.1:
* Fix build on Windows.
diff --git
a/ghc-7.10.3.old/libraries/haskeline/System/Console/Haskeline/Command/Completion.hs
b/ghc-7.10.3/libraries/haskeline/System/Console/Haskeline/Command/Completion.hs
index 97a887b..71a0f12 100644
---
a/ghc-7.10.3.old/libraries/haskeline/System/Console/Haskeline/Command/Completion.hs
+++
b/ghc-7.10.3/libraries/haskeline/System/Console/Haskeline/Command/Completion.hs
@@ -21,7 +21,7 @@ useCompletion im c = insertString r im
where r | isFinished c = replacement c ++ " "
| otherwise = replacement c
-askIMCompletions :: CommandMonad m =>
+askIMCompletions :: CommandMonad m =>
Command m InsertMode (InsertMode, [Completion])
askIMCompletions (IMode xs ys) = do
(rest, completions) <- lift $ runCompletion (withRev graphemesToString xs,
@@ -72,7 +72,7 @@ pagingCompletion :: MonadReader Layout m => Key -> Prefs
pagingCompletion k prefs completions = \im -> do
ls <- asks $ makeLines (map display completions)
let pageAction = do
-askFirst prefs (length completions) $
+askFirst prefs (length completions) $
if completionPaging prefs
then printPage ls
else effect (PrintLines ls)
@@ -134,7 +134,7 @@ padWords :: Int -> [String] -> String
padWords _ [x] = x
padWords _ [] = ""
padWords len (x:xs) = x ++ replicate (len - glength x) ' '
- ++ padWords len xs
+++ padWords len xs
where
-- kludge: compute the length in graphemes, not chars.
-- but don't use graphemes for the max length, since I'm not convinced
@@ -159,5 +159,3 @@ splitIntoGroups n xs = transpose $ unfoldr f xs
ceilDiv :: Integral a => a -> a -> a
ceilDiv m n | m `rem` n == 0= m `div` n
| otherwise = m `div` n + 1
-
-
diff --git
a/ghc-7.10.3.old/libraries/haskeline/System/Console/Haskeline/Command.hs
b/ghc-7.10.3/libraries/haskeline/System/Console/Haskeline/Command.hs
index 986fd42..1a0d915 100644
--- a/ghc-7.10.3.old/libraries/haskeline/System/Console/Haskeline/Command.hs
+++ b/ghc-7.10.3/libraries/haskeline/System/Console/Haskel
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-01-28 17:24:15
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-01-08 15:23:28.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-01-28
17:25:06.0 +0100
@@ -1,0 +2,9 @@
+Tue Jan 26 08:22:59 UTC 2016 - mimi...@gmail.com
+
+- update Cabal to 1.22.7.0
+- refresh u_Cabal_update.patch
+* Backport #3012 to the 1.22 branch
+* Add foldl' import
+* The Cabal part for fully gcc-like response files
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.nFgc01/_old 2016-01-28 17:25:07.0 +0100
+++ /var/tmp/diff_new_pack.nFgc01/_new 2016-01-28 17:25:07.0 +0100
@@ -125,7 +125,7 @@
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
-%ghc_lib_subpackage Cabal 1.22.6.0
+%ghc_lib_subpackage Cabal 1.22.7.0
%ghc_lib_subpackage array 0.5.1.0
%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.8.2.0
%ghc_lib_subpackage binary 0.7.5.0
++ u_Cabal_update.patch ++
--- /var/tmp/diff_new_pack.nFgc01/_old 2016-01-28 17:25:07.0 +0100
+++ /var/tmp/diff_new_pack.nFgc01/_new 2016-01-28 17:25:07.0 +0100
@@ -1,14 +1,23 @@
diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
-index b498ca0..f3b3c32 100644
+index b498ca0..bf64bd5 100644
--- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
@@ -1,5 +1,5 @@
name: Cabal
-version: 1.22.5.0
-+version: 1.22.6.0
++version: 1.22.7.0
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
+@@ -19,7 +19,7 @@ description:
+ organizing, and cataloging Haskell libraries and tools.
+ category: Distribution
+ cabal-version: >=1.10
+-build-type: Custom
++build-type: Simple
+ -- Even though we do use the default Setup.lhs it's vital to bootstrapping
+ -- that we build Setup.lhs using our own local Cabal source code.
+
@@ -145,7 +145,7 @@ library
if flag(bundled-binary-generic)
build-depends: binary >= 0.5 && < 0.7
@@ -77,6 +86,66 @@
-- Build static/dynamic object files for TH, if needed.
when compileForTH $
+diff --git
a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
+index 095d6b8..2d09292 100644
+--- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/Haddock.hs
+@@ -84,14 +84,16 @@ import Language.Haskell.Extension
+
+
+ import Control.Monad( when, forM_ )
++import Data.Char( isSpace )
+ import Data.Either ( rights )
+ import Data.Monoid
++import Data.Foldable( foldl' )
+ import Data.Maybe ( fromMaybe, listToMaybe )
+
+ import System.Directory (doesFileExist)
+ import System.FilePath ( (), (<.>)
+ , normalise, splitPath, joinPath, isAbsolute )
+-import System.IO(hClose, hPutStrLn, hSetEncoding, utf8)
++import System.IO(hClose, hPutStr, hPutStrLn, hSetEncoding, utf8)
+ import Distribution.Version
+
+ --
--
+@@ -467,7 +469,7 @@ renderArgs :: Verbosity
+ -> IO a
+ renderArgs verbosity tmpFileOpts version comp args k = do
+ let haddockSupportsUTF8 = version >= Version [2,14,4] []
+- haddockSupportsResponseFiles = version > Version [2,16,1] []
++ haddockSupportsResponseFiles = version > Version [2,16,2] []
+ createDirectoryIfMissingVerbose verbosity True outputDir
+ withTempFileEx tmpFileOpts outputDir "haddock-prologue.txt" $
+ \prologueFileName h -> do
+@@ -482,7 +484,7 @@ renderArgs verbosity tmpFileOpts version comp args k = do
+ withTempFileEx tmpFileOpts outputDir "haddock-response.txt" $
+ \responseFileName hf -> do
+ when haddockSupportsUTF8 (hSetEncoding hf utf8)
+- mapM_ (hPutStrLn hf) renderedArgs
++ hPutStr hf $ unlines $ map escapeArg renderedArgs
+ hClose hf
+ let respFile = "@" ++ responseFileName
+ k ([respFile], result)
+@@ -500,6 +502,19 @@ renderArgs verbosity tmpFileOpts version comp args k = do
+ pkgstr = display $ packageName pkgid
+ pkgid = arg argPackageName
+
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2016-01-08 15:23:22
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-12-29 12:59:59.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-01-08
15:23:28.0 +0100
@@ -1,0 +2,12 @@
+Tue Jan 5 18:54:25 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- update tarball to 7.10.3b
+* some documentation files were missing in the original
+ 7.10.3 tarball
+- add 0001-link-command-line-libs-to-temp-so.patch
+* fix panic in GHCi when linking against C library specified
+ as command line argument (-l)
+* currently under upstream review
+* fix Haskell trac #10458
+
+---
@@ -9 +21 @@
-Mon Dec 21 08:27:59 UTC 2015 - mimi...@gmail.com
+Mon Dec 21 08:45:50 UTC 2015 - mimi...@gmail.com
@@ -12,0 +25 @@
+- add u_terminfo_0402.patch -- update of terminfo
@@ -29,0 +43,3 @@
+- update to 7.10.3
+- add cabal-show-detail-direct.patch -- Fix testsuites with large output.
+Debian patch. Thanks Joachim for suggesting it in Haskell #10870!
Old:
ghc-7.10.2-src.tar.xz
New:
0001-link-command-line-libs-to-temp-so.patch
cabal-show-detail-direct.patch
ghc-7.10.3b-src.tar.xz
u_terminfo_0402.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.WNl9cU/_old 2016-01-08 15:23:30.0 +0100
+++ /var/tmp/diff_new_pack.WNl9cU/_new 2016-01-08 15:23:30.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -19,7 +19,7 @@
%global unregisterised_archs aarch64 s390 s390x
Name: ghc
-Version:7.10.2
+Version:7.10.3
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Summary:The Glorious Glasgow Haskell Compiler
@@ -56,7 +56,7 @@
BuildRequires: binutils-gold
%endif
-# Patch 19 and 22 change build system
+# Patch 19 changes build system
BuildRequires: autoconf
BuildRequires: automake
@@ -64,14 +64,20 @@
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
+Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}b-src.tar.xz
Source1:ghc-rpmlintrc
# PATCH-FIX-UPSTREAM fix signature of atomic builtins (#10926)
Patch1: atomic-cast.patch
+# PATCH-FIX-UPSTREAM cabal-show-detail-direct.patch
peter.tromm...@ohm-hochschule.de -- Fix testsuites with large output. Debian
patch. Thanks Joachim for suggesting it in Haskell #10870!
+Patch3: cabal-show-detail-direct.patch
+# PATCH_FIX-UPSTREAM 0001-link-command-line-libs-to-temp-so.patch --
peter.tromm...@ohm-hochschule.de -- Fix panic in GHCi. See Haskell trac #10458.
+Patch4: 0001-link-command-line-libs-to-temp-so.patch
# PATCH-FEATURE-UPSTREAM 0001-implement-native-code-generator-for-ppc64.patch
peter.tromm...@ohm-hochschule.de -- Implement native code generator for ppc64.
Haskell Trac #9863.
Patch19:0001-implement-native-code-generator-for-ppc64.patch
# PATCH-FIX-UPSTREAM ghc.git-b29f20.patch peter.tromm...@ohm-hochschule.de --
nativeGen PPC: fix > 16 bit offsets in stack handling. This is a backport of my
patch for Haskell trac #7830. We do not use erikd's patch because we have 64
bit native code generation for ppc64[le]. See patch 19.
Patch20:ghc.git-b29f20.patch
+# PATCH-FIX-UPSTREAM u_terminfo_0402.patch mimi...@gmail.com -- update
terminfo to 0.4.0.2
+Patch21:u_terminfo_0402.patch
# PATCH-FIX-UPSTREAM u_Cabal_update.patch mimi...@gmail.com -- update Cabal to
1.22.6.0
Patch22:u_Cabal_update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -121,7 +127,7 @@
%if %{defined ghclibdir}
%ghc_lib_subpackage Cabal 1.22.6.0
%ghc_lib_subpackage array 0.5.1.0
-%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.8.1.0
+%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.8.2.0
%ghc_lib_subpackage binary 0.7.5.0
%ghc_lib_subpackage bytestring 0.10.6.0
%ghc_lib_subpackage containers 0.5.6.2
@@ -163,13 +169,16 @@
%prep
%setup -q
%patch1 -p1
+%patch3 -p1
+%patch4 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p2
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-12-29 12:59:57
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-12-23 08:50:20.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-12-29
12:59:59.0 +0100
@@ -1,0 +2,7 @@
+Mon Dec 28 08:52:20 UTC 2015 - mimi...@gmail.com
+
+- update Cabal to 1.22.6.0
+- add u_Cabal_update.patch -- update of Cabal
+* Relax upper bound to allow upcoming binary-0.8
+
+---
New:
u_Cabal_update.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.rGrxwN/_old 2015-12-29 13:00:01.0 +0100
+++ /var/tmp/diff_new_pack.rGrxwN/_new 2015-12-29 13:00:01.0 +0100
@@ -72,7 +72,8 @@
Patch19:0001-implement-native-code-generator-for-ppc64.patch
# PATCH-FIX-UPSTREAM ghc.git-b29f20.patch peter.tromm...@ohm-hochschule.de --
nativeGen PPC: fix > 16 bit offsets in stack handling. This is a backport of my
patch for Haskell trac #7830. We do not use erikd's patch because we have 64
bit native code generation for ppc64[le]. See patch 19.
Patch20:ghc.git-b29f20.patch
-
+# PATCH-FIX-UPSTREAM u_Cabal_update.patch mimi...@gmail.com -- update Cabal to
1.22.6.0
+Patch22:u_Cabal_update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -118,7 +119,7 @@
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
-%ghc_lib_subpackage Cabal 1.22.5.0
+%ghc_lib_subpackage Cabal 1.22.6.0
%ghc_lib_subpackage array 0.5.1.0
%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.8.1.0
%ghc_lib_subpackage binary 0.7.5.0
@@ -164,6 +165,7 @@
%patch1 -p1
%patch19 -p1
%patch20 -p1
+%patch22 -p2
%build
# Patch 19 modifies build system
++ u_Cabal_update.patch ++
diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
index b498ca0..f3b3c32 100644
--- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Cabal.cabal
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Cabal.cabal
@@ -1,5 +1,5 @@
name: Cabal
-version: 1.22.5.0
+version: 1.22.6.0
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
@@ -145,7 +145,7 @@ library
if flag(bundled-binary-generic)
build-depends: binary >= 0.5 && < 0.7
else
-build-depends: binary >= 0.7 && < 0.8
+build-depends: binary >= 0.7 && < 0.9
-- Needed for GHC.Generics before GHC 7.6
if impl(ghc < 7.6)
@@ -265,7 +265,7 @@ test-suite unit-tests
test-framework-hunit,
test-framework-quickcheck2,
HUnit,
-QuickCheck < 2.8,
+QuickCheck < 2.9,
Cabal
ghc-options: -Wall
default-language: Haskell98
@@ -312,7 +312,7 @@ test-suite package-tests
test-framework-quickcheck2 >= 0.2.12,
test-framework-hunit,
HUnit,
-QuickCheck >= 2.1.0.1 && < 2.8,
+QuickCheck >= 2.1.0.1 && < 2.9,
Cabal,
process,
directory,
diff --git a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
index 444c851..270e2c3 100644
--- a/ghc-7.10.3.old/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+++ b/ghc-7.10.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
@@ -553,8 +553,10 @@ buildOrReplLib forRepl verbosity numJobs pkg_descr lbi lib
clbi = do
-- TODO: problem here is we need the .c files built first, so we can load
them
-- with ghci, but .c files can depend on .h files generated by ghc by ffi
-- exports.
- unless (null (libModules lib)) $
- ifReplLib (runGhcProg replOpts)
+
+ ifReplLib $ do
+when (null (libModules lib)) $ warn verbosity "No exposed modules"
+ifReplLib (runGhcProg replOpts)
-- link:
unless forRepl $ do
@@ -766,7 +768,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
ghcOptLinkLibPath= toNubListR $ extraLibDirs exeBi,
ghcOptLinkFrameworks = toNubListR $ PD.frameworks exeBi,
ghcOptInputFiles = toNubListR
- [exeDir x | x <- cObjs],
+ [exeDir x | x <- cObjs]
+}
+ dynLinkerOpts = mempty {
ghcOptRPaths = rpaths
}
replOpts = baseOpts {
@@ -812,9 +816,9 @@ buildOrReplExe forRepl verbosity numJobs _pkg_descr lbi
| otherwise= doingTH && (withProfExe lbi || withDynExe lbi)
linkOpts = commonOpts `mappe
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-12-23 08:50:18
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-12-09 22:16:46.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-12-23
08:50:20.0 +0100
@@ -1,0 +2,6 @@
+Mon Dec 21 08:27:59 UTC 2015 - mimi...@gmail.com
+
+- update terminfo to 0.4.0.2
+- drop remove-cur_term-usage.patch - merged by upstream
+
+---
Old:
remove-cur_term-usage.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.CqyTdr/_old 2015-12-23 08:50:22.0 +0100
+++ /var/tmp/diff_new_pack.CqyTdr/_new 2015-12-23 08:50:22.0 +0100
@@ -72,8 +72,6 @@
Patch19:0001-implement-native-code-generator-for-ppc64.patch
# PATCH-FIX-UPSTREAM ghc.git-b29f20.patch peter.tromm...@ohm-hochschule.de --
nativeGen PPC: fix > 16 bit offsets in stack handling. This is a backport of my
patch for Haskell trac #7830. We do not use erikd's patch because we have 64
bit native code generation for ppc64[le]. See patch 19.
Patch20:ghc.git-b29f20.patch
-# PATCH-FIX-UPSTREAM judah.jacob...@gmail.com, sbahl...@suse.com --
remove-cur_term-usage.patch openSUSE's ncurses6 doesn't export cur_term function
-Patch24:remove-cur_term-usage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -138,7 +136,7 @@
%ghc_lib_subpackage pretty 1.1.2.0
%ghc_lib_subpackage process 1.2.3.0
%ghc_lib_subpackage template-haskell 2.10.0.0
-%ghc_lib_subpackage terminfo 0.4.0.1
+%ghc_lib_subpackage terminfo 0.4.0.2
%ghc_lib_subpackage time 1.5.0.1
%ghc_lib_subpackage transformers 0.4.2.0
%ghc_lib_subpackage unix 2.7.1.0
@@ -166,7 +164,6 @@
%patch1 -p1
%patch19 -p1
%patch20 -p1
-%patch24 -p1
%build
# Patch 19 modifies build system
++ ghc-7.10.2-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-7.10.2-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new/ghc-7.10.2-src.tar.xz differ: char 26, line
1
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-12-09 19:54:10
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-10-12 10:02:21.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-12-09
22:16:46.0 +0100
@@ -1,0 +2,13 @@
+Mon Dec 7 14:18:50 UTC 2015 - mimi...@gmail.com
+
+- update Cabal to 1.22.5.0
+* Don't recompile C sources unless needed
+* Support Haddock response files.
+* Add frameworks when linking a dynamic library.
+
+---
+Tue Dec 1 08:26:43 UTC 2015 - mimi...@gmail.com
+
+- use upstream variant of remove-cur_term-usage.patch
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.WeZXGj/_old 2015-12-09 22:16:48.0 +0100
+++ /var/tmp/diff_new_pack.WeZXGj/_new 2015-12-09 22:16:48.0 +0100
@@ -72,7 +72,7 @@
Patch19:0001-implement-native-code-generator-for-ppc64.patch
# PATCH-FIX-UPSTREAM ghc.git-b29f20.patch peter.tromm...@ohm-hochschule.de --
nativeGen PPC: fix > 16 bit offsets in stack handling. This is a backport of my
patch for Haskell trac #7830. We do not use erikd's patch because we have 64
bit native code generation for ppc64[le]. See patch 19.
Patch20:ghc.git-b29f20.patch
-# PATCH-FIX-OPENSUSE sbahl...@suse.com -- remove-cur_term-usage.patch
openSUSE's ncurses6 doesn't export cur_term function
+# PATCH-FIX-UPSTREAM judah.jacob...@gmail.com, sbahl...@suse.com --
remove-cur_term-usage.patch openSUSE's ncurses6 doesn't export cur_term function
Patch24:remove-cur_term-usage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -120,7 +120,7 @@
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
-%ghc_lib_subpackage Cabal 1.22.4.0
+%ghc_lib_subpackage Cabal 1.22.5.0
%ghc_lib_subpackage array 0.5.1.0
%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.8.1.0
%ghc_lib_subpackage binary 0.7.5.0
++ ghc-7.10.2-src.tar.xz ++
/work/SRC/openSUSE:Factory/ghc/ghc-7.10.2-src.tar.xz
/work/SRC/openSUSE:Factory/.ghc.new/ghc-7.10.2-src.tar.xz differ: char 26, line
1
++ remove-cur_term-usage.patch ++
--- /var/tmp/diff_new_pack.WeZXGj/_old 2015-12-09 22:16:48.0 +0100
+++ /var/tmp/diff_new_pack.WeZXGj/_new 2015-12-09 22:16:48.0 +0100
@@ -1,63 +1,41 @@
-Subject: Remove use of cur_term global struct
-From: Scott Bahling sbahl...@suse.com
-Date: 2015-10-04
+From 96455041834b54f86482741d940a7941c53cd01e Mon Sep 17 00:00:00 2001
+From: Judah Jacobson
+Date: Mon, 30 Nov 2015 23:28:27 -0800
+Subject: [PATCH] Use set_curterm instead of peek/poking curterm directly.
-With the move to ncurses6, it has been decided by the openSUSE
-developer to build the library in threaded mode only. In threaded
-mode, the global variables are protected and not exported.
+This fixes the build of GHC on openSUSE, which builds ncurses in "threaded"
+mode. (Threaded ncurses hides the cur_term global from use).
-ghc-terminfo was accessing (reading and writing) the cur_term
-global so it doesn't work with the openSUSE threaded ncurses6
-library. This is an attempt to remove the need to access cur_term
-and rely only on the low-level functions.
-
-First, cur_term was being set to a null pointer in order to force
-ncurses setupterm() to return new struct instead of a copy of the
-current when the terminal name is the same. Actually (and unfortunately)
-setupterm() does not return the struct but rather set the global cur_term.
-Reading the ncurses code, and the NEWS file, it appears that the
-behavior of setupterm() had been changed quite some time ago, and no
-longer returns a copy of the struct (internal 'reuse' option) (NEWS 20041127).
-The code seems to confirm this, so setting cur_term to a null pointer
-shouldn't really be required - we remove poke cur_term!
-
-That's great, but the we still have the problem that setupterm() doesn't
-return the terminal struct that is required later to setup the
-cleanup routine of the Terminal type (del_curterm cterm). The only
-function that appears to return the cur_term pointer is set_curterm()
-which has the side effect of overwriting the current pointer in the
-process :/ So, we call set_curterm() with a null pointer, retrieving
-the former, cur_term pointer for our use in the cterm instance, and
-then call set_curterm() again with the former pointer to set it
-back again whew! Having looked at the ncurses set_curterm() code
-it seems
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2015-10-12 10:02:17 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-10-08 08:26:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-10-12 10:02:21.0 +0200 @@ -1,0 +2,9 @@ +Tue Oct 6 19:18:08 UTC 2015 - peter.tromm...@ohm-hochschule.de + +- add ghc.git-b29f20.patch +* fixes upstream #7830 +* fix ghc 7.10.2 failing to bootstrap ghc head on ppc +and perhaps ppc64 with some optimizations enabled +* backport of my patch for upcoming ghc 8.0.1 + +--- New: ghc.git-b29f20.patch Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.fENZ1A/_old 2015-10-12 10:02:22.0 +0200 +++ /var/tmp/diff_new_pack.fENZ1A/_new 2015-10-12 10:02:22.0 +0200 @@ -70,6 +70,8 @@ Patch1: atomic-cast.patch # PATCH-FEATURE-UPSTREAM 0001-implement-native-code-generator-for-ppc64.patch peter.tromm...@ohm-hochschule.de -- Implement native code generator for ppc64. Haskell Trac #9863. Patch19:0001-implement-native-code-generator-for-ppc64.patch +# PATCH-FIX-UPSTREAM ghc.git-b29f20.patch peter.tromm...@ohm-hochschule.de -- nativeGen PPC: fix > 16 bit offsets in stack handling. This is a backport of my patch for Haskell trac #7830. We do not use erikd's patch because we have 64 bit native code generation for ppc64[le]. See patch 19. +Patch20:ghc.git-b29f20.patch # PATCH-FIX-OPENSUSE sbahl...@suse.com -- remove-cur_term-usage.patch openSUSE's ncurses6 doesn't export cur_term function Patch24:remove-cur_term-usage.patch @@ -163,10 +165,11 @@ %setup -q %patch1 -p1 %patch19 -p1 +%patch20 -p1 %patch24 -p1 %build -# Patch 19 and 22 modify build system +# Patch 19 modifies build system perl boot # Check if bootstrap is required, i.e. version is different from ghc's version ++ ghc.git-b29f20.patch ++ >From b29f20edb1ca7f1763ceb001e2bb2d5f2f11bec3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Fri, 2 Oct 2015 15:48:30 +0200 Subject: [PATCH] nativeGen PPC: fix > 16 bit offsets in stack handling Implement access to spill slots at offsets larger than 16 bits. Also allocation and deallocation of spill slots was restricted to 16 bit offsets. Now 32 bit offsets are supported on all PowerPC platforms. The implementation of 32 bit offsets requires more than one instruction but the native code generator wants one instruction. So we implement pseudo-instructions that are pretty printed into multiple assembly instructions. With pseudo-instructions for spill slot allocation and deallocation we can also implement handling of the back chain pointer according to the ELF ABIs. Test Plan: validate (especially on powerpc (32 bit)) Reviewers: bgamari, austin, erikd Reviewed By: erikd Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1296 GHC Trac Issues: #7830 --- compiler/nativeGen/PPC/Instr.hs | 39 --- compiler/nativeGen/PPC/Ppr.hs | 33 + compiler/nativeGen/PPC/Regs.hs | 14 -- includes/CodeGen.Platform.hs| 18 +- 4 files changed, 86 insertions(+), 18 deletions(-) Index: ghc-7.10.2/compiler/nativeGen/PPC/Instr.hs === --- ghc-7.10.2.orig/compiler/nativeGen/PPC/Instr.hs +++ ghc-7.10.2/compiler/nativeGen/PPC/Instr.hs @@ -75,19 +75,19 @@ instance Instruction Instr where ppc_mkStackAllocInstr :: Platform -> Int -> Instr ppc_mkStackAllocInstr platform amount - = case platformArch platform of - ArchPPC-> -- SUB II32 (OpImm (ImmInt amount)) (OpReg esp) -ADD sp sp (RIImm (ImmInt (-amount))) - ArchPPC_64 _ -> STU II64 sp (AddrRegImm sp (ImmInt (-amount))) - arch -> panic $ "ppc_mkStackAllocInstr " ++ show arch + = ppc_mkStackAllocInstr' platform (-amount) ppc_mkStackDeallocInstr :: Platform -> Int -> Instr ppc_mkStackDeallocInstr platform amount + = ppc_mkStackAllocInstr' platform amount + +ppc_mkStackAllocInstr' :: Platform -> Int -> Instr +ppc_mkStackAllocInstr' platform amount = case platformArch platform of - ArchPPC-> -- ADD II32 (OpImm (ImmInt amount)) (OpReg esp) -ADD sp sp (RIImm (ImmInt amount)) - ArchPPC_64 _ -> ADD sp sp (RIImm (ImmInt amount)) - arch -> panic $ "ppc_mkStackDeallocInstr " ++ show arch +ArchPPC -> UPDATE_SP II32 (ImmInt amount) +ArchPPC_64 _ -> UPDATE_SP
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-10-08 08:26:08
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-10-06 13:27:39.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-10-08
08:26:13.0 +0200
@@ -1,0 +2,6 @@
+Mon Oct 5 07:47:58 UTC 2015 - sch...@suse.de
+
+- atomic-cast.patch: fix signature of atomic bultins
+- ghc-7.8-arm-use-ld-gold.patch: remove obsolete patch
+
+---
Old:
ghc-7.8-arm-use-ld-gold.patch
New:
atomic-cast.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.gSqC9z/_old 2015-10-08 08:26:14.0 +0200
+++ /var/tmp/diff_new_pack.gSqC9z/_new 2015-10-08 08:26:14.0 +0200
@@ -66,10 +66,10 @@
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Source1:ghc-rpmlintrc
+# PATCH-FIX-UPSTREAM fix signature of atomic builtins (#10926)
+Patch1: atomic-cast.patch
# PATCH-FEATURE-UPSTREAM 0001-implement-native-code-generator-for-ppc64.patch
peter.tromm...@ohm-hochschule.de -- Implement native code generator for ppc64.
Haskell Trac #9863.
Patch19:0001-implement-native-code-generator-for-ppc64.patch
-# PATCH-FIX-UPSTREAM peter.tromm...@ohm-hochschule.de -- GNU ld does not work
with ghc on aarch64 so use Gold. Adapted from Fedora patch 24.
-Patch23:ghc-7.8-arm-use-ld-gold.patch
# PATCH-FIX-OPENSUSE sbahl...@suse.com -- remove-cur_term-usage.patch
openSUSE's ncurses6 doesn't export cur_term function
Patch24:remove-cur_term-usage.patch
@@ -161,13 +161,10 @@
%prep
%setup -q
+%patch1 -p1
%patch19 -p1
%patch24 -p1
-#%%ifarch armv7hl aarch64
-#%%patch23 -p1 -b .24~
-#%%endif
-
%build
# Patch 19 and 22 modify build system
perl boot
++ atomic-cast.patch ++
>From e3d2bab86fc89113f8ee65800fdfac81d8d54851 Mon Sep 17 00:00:00 2001
From: Andreas Schwab
Date: Fri, 2 Oct 2015 23:03:12 +0200
Subject: [PATCH] Fix signature of atomic builtins
This patch is due to Andreas Schwab.
This fixes #10926, which reports (on AArch64) errors of the form,
```
/tmp/ghc1492_0/ghc_1.hc:2844:25: warning: passing argument 1 of
'hs_atomic_xor64' makes pointer from integer without a cast
[-Wint-conversion]
_c1Ho = hs_atomic_xor64((*Sp) + (((Sp[1]) << 0x3UL) + 0x10UL), Sp[2]);
^
In file included from
/home/abuild/rpmbuild/BUILD/ghc-7.10.2/includes/Stg.h:273:0: 0,
from /tmp/ghc1492_0/ghc_1.hc:3:
/home/abuild/rpmbuild/BUILD/ghc-7.10.2/includes/stg/Prim.h:41:11:
note: expected 'volatile StgWord64 *
{aka volatile long unsigned int *}'
but argument is of type 'long unsigned int'
StgWord64 hs_atomic_xor64(volatile StgWord64 *x, StgWord64 val);
^
```
Test Plan: Validate
Reviewers: austin, simonmar
Reviewed By: simonmar
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1300
GHC Trac Issues: #10926
---
includes/stg/Prim.h | 72 ++--
libraries/ghc-prim/cbits/atomic.c | 224 +++---
2 files changed, 148 insertions(+), 148 deletions(-)
Index: ghc-7.10.2/includes/stg/Prim.h
===
--- ghc-7.10.2.orig/includes/stg/Prim.h
+++ ghc-7.10.2/includes/stg/Prim.h
@@ -15,42 +15,42 @@
#define PRIM_H
/* libraries/ghc-prim/cbits/atomic.c */
-StgWord hs_atomic_add8(volatile StgWord8 *x, StgWord val);
-StgWord hs_atomic_add16(volatile StgWord16 *x, StgWord val);
-StgWord hs_atomic_add32(volatile StgWord32 *x, StgWord val);
-StgWord64 hs_atomic_add64(volatile StgWord64 *x, StgWord64 val);
-StgWord hs_atomic_sub8(volatile StgWord8 *x, StgWord val);
-StgWord hs_atomic_sub16(volatile StgWord16 *x, StgWord val);
-StgWord hs_atomic_sub32(volatile StgWord32 *x, StgWord val);
-StgWord64 hs_atomic_sub64(volatile StgWord64 *x, StgWord64 val);
-StgWord hs_atomic_and8(volatile StgWord8 *x, StgWord val);
-StgWord hs_atomic_and16(volatile StgWord16 *x, StgWord val);
-StgWord hs_atomic_and32(volatile StgWord32 *x, StgWord val);
-StgWord64 hs_atomic_and64(volatile StgWord64 *x, StgWord64 val);
-StgWord hs_atomic_nand8(volatile StgWord8 *x, StgWord val);
-StgWord hs_atomic_nand16(volatile StgWord16 *x, StgWord val);
-StgWord hs_atomic_nand32(volatile StgWord32 *x, StgWord val);
-StgWord64 hs_atomic_nand64(volatile StgWord64 *x, StgWord64 val);
-StgWord hs_atomic_or8(volatile StgWord8 *x, StgWo
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-10-06 13:27:28
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-09-24 06:15:20.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-10-06
13:27:39.0 +0200
@@ -1,0 +2,13 @@
+Sat Oct 3 18:50:28 UTC 2015 - sbahl...@suse.com
+
+- Remove ncurses6.patch - it's not so easy ;)
+- Add remove-cur_term-usage.patch to remove the need to access the
+ cur_term global which isn't available in the openSUSE ncurses6
+ build.
+
+---
+Sat Oct 3 15:59:19 UTC 2015 - mimi...@gmail.com
+
+- Add choice for libffi in openSUSE:Leap:42.1
+
+---
@@ -6 +19 @@
- Tomas Cech - sleep_wal...@opensuse.org
+ Tomas Cech sleep_wal...@opensuse.org
Old:
ncurses6.patch
New:
remove-cur_term-usage.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.BVFzUO/_old 2015-10-06 13:27:40.0 +0200
+++ /var/tmp/diff_new_pack.BVFzUO/_new 2015-10-06 13:27:40.0 +0200
@@ -33,7 +33,12 @@
BuildRequires: glibc-devel
BuildRequires: gmp-devel
BuildRequires: libelf-devel
+#Fix for openSUSE:Leap:42.1
+%if 0%{?suse_version} == 1315
+BuildRequires: libffi48-devel
+%else
BuildRequires: libffi-devel
+%endif
#TODO ghc-7.10.2 supports only llvm-3.5, need talk with llvm packagers about
# versioned build of llvm
#%%ifnarch ppc aarch64
@@ -65,8 +70,8 @@
Patch19:0001-implement-native-code-generator-for-ppc64.patch
# PATCH-FIX-UPSTREAM peter.tromm...@ohm-hochschule.de -- GNU ld does not work
with ghc on aarch64 so use Gold. Adapted from Fedora patch 24.
Patch23:ghc-7.8-arm-use-ld-gold.patch
-# PATCH-FIX-OPENSUSE tc...@suse.cz -- ncurses6 doesn't export cur_term function
-Patch24: ncurses6.patch
+# PATCH-FIX-OPENSUSE sbahl...@suse.com -- remove-cur_term-usage.patch
openSUSE's ncurses6 doesn't export cur_term function
+Patch24:remove-cur_term-usage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -157,9 +162,7 @@
%prep
%setup -q
%patch19 -p1
-%if 0%{?suse_version} > 1320
%patch24 -p1
-%endif
#%%ifarch armv7hl aarch64
#%%patch23 -p1 -b .24~
++ remove-cur_term-usage.patch ++
Subject: Remove use of cur_term global struct
From: Scott Bahling sbahl...@suse.com
Date: 2015-10-04
With the move to ncurses6, it has been decided by the openSUSE
developer to build the library in threaded mode only. In threaded
mode, the global variables are protected and not exported.
ghc-terminfo was accessing (reading and writing) the cur_term
global so it doesn't work with the openSUSE threaded ncurses6
library. This is an attempt to remove the need to access cur_term
and rely only on the low-level functions.
First, cur_term was being set to a null pointer in order to force
ncurses setupterm() to return new struct instead of a copy of the
current when the terminal name is the same. Actually (and unfortunately)
setupterm() does not return the struct but rather set the global cur_term.
Reading the ncurses code, and the NEWS file, it appears that the
behavior of setupterm() had been changed quite some time ago, and no
longer returns a copy of the struct (internal 'reuse' option) (NEWS 20041127).
The code seems to confirm this, so setting cur_term to a null pointer
shouldn't really be required - we remove poke cur_term!
That's great, but the we still have the problem that setupterm() doesn't
return the terminal struct that is required later to setup the
cleanup routine of the Terminal type (del_curterm cterm). The only
function that appears to return the cur_term pointer is set_curterm()
which has the side effect of overwriting the current pointer in the
process :/ So, we call set_curterm() with a null pointer, retrieving
the former, cur_term pointer for our use in the cterm instance, and
then call set_curterm() again with the former pointer to set it
back again whew! Having looked at the ncurses set_curterm() code
it seems it handles a null pointer in the way we would need.
Later in the withCurTerm function we use virtually the same trick
to relieve the need to peek into the cur_term global. I'm not so
sure if this is Haskell correct code though.
Someone with more Haskell programming knowledge than me should review
this patch. It still needs to be tested as well.
---
diff -Nrup a/libraries/terminfo/System/Console/Terminfo/Base.hs
b/libraries/terminfo/System/Console/Terminfo/Base.hs
--- a/libraries/terminfo/System/
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-09-24 06:15:16
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-08-23 17:38:38.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-09-24
06:15:20.0 +0200
@@ -1,0 +2,7 @@
+Sun Sep 20 16:30:09 UTC 2015 - mimi...@gmail.com
+
+- remove llvm from requires
+- add ncurses6.patch to fix build with ncurses6, all thanks goes to
+ Tomas Cech - sleep_wal...@opensuse.org
+
+---
New:
ncurses6.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.DRaMj4/_old 2015-09-24 06:15:21.0 +0200
+++ /var/tmp/diff_new_pack.DRaMj4/_new 2015-09-24 06:15:21.0 +0200
@@ -34,9 +34,11 @@
BuildRequires: gmp-devel
BuildRequires: libelf-devel
BuildRequires: libffi-devel
-%ifnarch ppc aarch64
-BuildRequires: llvm
-%endif
+#TODO ghc-7.10.2 supports only llvm-3.5, need talk with llvm packagers about
+# versioned build of llvm
+#%%ifnarch ppc aarch64
+#BuildRequires: llvm
+#%%endif
BuildRequires: ncurses-devel
BuildRequires: pkg-config
BuildRequires: xz
@@ -63,6 +65,8 @@
Patch19:0001-implement-native-code-generator-for-ppc64.patch
# PATCH-FIX-UPSTREAM peter.tromm...@ohm-hochschule.de -- GNU ld does not work
with ghc on aarch64 so use Gold. Adapted from Fedora patch 24.
Patch23:ghc-7.8-arm-use-ld-gold.patch
+# PATCH-FIX-OPENSUSE tc...@suse.cz -- ncurses6 doesn't export cur_term function
+Patch24: ncurses6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -153,6 +157,9 @@
%prep
%setup -q
%patch19 -p1
+%if 0%{?suse_version} > 1320
+%patch24 -p1
+%endif
#%%ifarch armv7hl aarch64
#%%patch23 -p1 -b .24~
++ ncurses6.patch ++
Index: ghc-7.10.2/libraries/terminfo/System/Console/Terminfo/Base.hs
===
--- ghc-7.10.2.orig/libraries/terminfo/System/Console/Terminfo/Base.hs
+++ ghc-7.10.2/libraries/terminfo/System/Console/Terminfo/Base.hs
@@ -63,7 +63,7 @@ import Data.Typeable
data TERMINAL
newtype Terminal = Terminal (ForeignPtr TERMINAL)
-foreign import ccall "&" cur_term :: Ptr (Ptr TERMINAL)
+foreign import ccall "&" _nc_cur_term :: Ptr (Ptr TERMINAL)
foreign import ccall set_curterm :: Ptr TERMINAL -> IO (Ptr TERMINAL)
foreign import ccall "&" del_curterm :: FunPtr (Ptr TERMINAL -> IO ())
@@ -73,7 +73,7 @@ foreign import ccall setupterm :: CStrin
--
-- Throws a 'SetupTermError' if the terminfo database could not be read.
setupTerm :: String -> IO Terminal
-setupTerm term = bracket (peek cur_term) (poke cur_term) $ \_ ->
+setupTerm term = bracket (peek _nc_cur_term) (poke _nc_cur_term) $ \_ ->
withCString term $ \c_term ->
with 0 $ \ret_ptr -> do
-- NOTE: I believe that for the way we use terminfo
@@ -85,7 +85,7 @@ setupTerm term = bracket (peek cur_term)
terminal names are the same). This prevents problems
when calling del_term on a struct shared by more than one
Terminal. --}
-poke cur_term nullPtr
+poke _nc_cur_term nullPtr
-- Call setupterm and check the return value.
setupterm c_term stdOutput ret_ptr
ret <- peek ret_ptr
@@ -93,7 +93,7 @@ setupTerm term = bracket (peek cur_term)
then throwIO $ SetupTermError
$ "Couldn't look up terminfo entry " ++ show term
else do
-cterm <- peek cur_term
+cterm <- peek _nc_cur_term
fmap Terminal $ newForeignPtr del_curterm cterm
data SetupTermError = SetupTermError String
@@ -120,7 +120,7 @@ setupTermFromEnv = do
-- TODO: this isn't really thread-safe...
withCurTerm :: Terminal -> IO a -> IO a
withCurTerm (Terminal term) f = withForeignPtr term $ \cterm -> do
-old_term <- peek cur_term
+old_term <- peek _nc_cur_term
if old_term /= cterm
then do
_ <- set_curterm cterm
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-08-23 15:43:31
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-08-05 06:51:48.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-08-23
17:38:38.0 +0200
@@ -1,0 +2,36 @@
+Mon Aug 10 17:38:34 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- update to 7.10.2
+* type checker fixes
+* fixes for Aarch64 support
+* fix deadlock in runtime system when scheduling garbage collection
+- 7.10.1 highlights
+* implement Applicative Monad Proposal
+* implement Burning Bridges Proposal
+* support for partial type signatures
+* reimplement integer-gmp
+* support plugins in type checker (experimental!)
+- drop llvm-powerpc64-datalayout.patch
+* this patch was incomplete all along and now we have our native
+ code generator
+- drop ghc-cabal-unversion-docdir.patch
+* ghc-rpm-macros is following ghc's doc layout so no need to patch
+- drop D349.patch
+* fixed upstream
+- drop integer-gmp.patch
+* we do not support SLE11 anymore
+- drop ghc-7.8.2-cgen-constify.patch
+* fixed upstream
+- drop D560.patch
+* fixed upstream
+- drop ghc-glibc-2.20_BSD_SOURCE.patch
+* fixed upstream
+- drop ghc-arm64.patch
+* fixed upstream
+- drop ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch
+* fixed upstream
+- refresh 0001-implement-native-code-generator-for-ppc64.patch
+- disable ghc-7.8-arm-use-ld-gold.patch
+* not sure we need this, must be rebased if we do
+
+---
Old:
D349.patch
D560.patch
_service
ghc-7.8.2-cgen-constify.patch
ghc-7.8.4-src.tar.xz
ghc-arm64.patch
ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch
ghc-glibc-2.20_BSD_SOURCE.patch
integer-gmp.patch
llvm-powerpc64-datalayout.patch
New:
ghc-7.10.2-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.tkWoen/_old 2015-08-23 17:38:39.0 +0200
+++ /var/tmp/diff_new_pack.tkWoen/_new 2015-08-23 17:38:39.0 +0200
@@ -19,7 +19,7 @@
%global unregisterised_archs aarch64 s390 s390x
Name: ghc
-Version:7.8.4
+Version:7.10.2
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Summary:The Glorious Glasgow Haskell Compiler
@@ -28,7 +28,7 @@
ExclusiveArch: aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390 s390x
BuildRequires: binutils-devel
BuildRequires: gcc
-BuildRequires: ghc-bootstrap >= 7.4
+BuildRequires: ghc-bootstrap >= 7.6
BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
@@ -59,24 +59,8 @@
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz
Source1:ghc-rpmlintrc
-# PATCH-FIX-UPSTREAM llvm-powerpc64-datalayout.patch
peter.tromm...@ohm-hochschule.de - Add target datalayout for llvm on powerpc 64.
-Patch8: llvm-powerpc64-datalayout.patch
-# PATCH-FIX-UPSTREAM D349.patch peter.tromm...@ohm-hochschule.de - Fix dynamic
linker, see Haskell trac #8935.
-Patch12:D349.patch
-# PATCH-FIX-UPSTREAM integer-gmp.patch peter.tromm...@ohm-hochschule.de -- Fix
upstream ticket #8156 see https://ghc.haskell.org/trac/ghc/ticket/8156. We need
this for SLE 11 where libgmp is too old and so we have to use the bundled
libgmp. This patch fixes the build.
-Patch13:integer-gmp.patch
-# PATCH-FIX-UPSTREAM ghc-7.8.2-cgen-constify.patch
peter.tromm...@ohm-hochschule.de - Make constant strings constant in C backend
to save data segment space. This is a gentoo patch.
-Patch14:ghc-7.8.2-cgen-constify.patch
-# PATCH-FIX-UPSTREAM D560.patch peter.tromm...@ohm-hochschule.de -- Fix
loading of PIC register. See https://phabricator.haskell.org/D560.
-Patch18:D560.patch
# PATCH-FEATURE-UPSTREAM 0001-implement-native-code-generator-for-ppc64.patch
peter.tromm...@ohm-hochschule.de -- Implement native code generator for ppc64.
Haskell Trac #9863.
Patch19:0001-implement-native-code-generator-for-ppc64.patch
-# PATCH-FIX-UPSTREAM ghc-glibc-2.20_BSD_SOURCE.patch
peter.tromm...@ohm-hochschule.de -- Define _DEFAULT_SOURCE in Stg.h to avoid
warnings from glibc. Fedora patch
-Patch20:ghc-glibc-2.20_BSD_SOURCE.patch
-# PATCH-FIX-OPENSUSE add aarch64 support
-Patch21:ghc-arm64.patch
-# PATCH-FIX-UPSTREAM
ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch
peter.tromm...@ohm-hochschule.de -- Provide SMP implementation and enable GH
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-08-05 06:51:46
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-06-06 09:54:33.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-08-05
06:51:48.0 +0200
@@ -1,0 +2,8 @@
+Fri Jul 17 14:58:44 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- add ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch
+* enable SMP and GHCi on Aarch64
+- add ghc-7.8-arm-use-ld-gold.patch
+* Aarch64 needs gold linker
+
+---
New:
ghc-7.8-arm-use-ld-gold.patch
ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.FBN5ev/_old 2015-08-05 06:51:49.0 +0200
+++ /var/tmp/diff_new_pack.FBN5ev/_new 2015-08-05 06:51:49.0 +0200
@@ -45,7 +45,11 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
%endif
-# Patch 19 changes build system
+%ifarch aarch64
+BuildRequires: binutils-gold
+%endif
+
+# Patch 19 and 22 change build system
BuildRequires: autoconf
BuildRequires: automake
@@ -71,6 +75,10 @@
Patch20:ghc-glibc-2.20_BSD_SOURCE.patch
# PATCH-FIX-OPENSUSE add aarch64 support
Patch21:ghc-arm64.patch
+# PATCH-FIX-UPSTREAM
ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch
peter.tromm...@ohm-hochschule.de -- Provide SMP implementation and enable GHCi
on aarch64. Adapted from Fedora patch 26.
+Patch22:ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch
+# PATCH-FIX-UPSTREAM peter.tromm...@ohm-hochschule.de -- GNU ld does not work
with ghc on aarch64 so use Gold. Adapted from Fedora patch 24.
+Patch23:ghc-7.8-arm-use-ld-gold.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -102,6 +110,9 @@
Requires: glibc-locale
Requires(post): update-alternatives
Requires(postun): update-alternatives
+%ifarch aarch64
+Requires: binutils-gold
+%endif
%description compiler
This package contains the GHC compiler, tools and utilities.
@@ -169,9 +180,16 @@
%patch19 -p1
%patch20 -p1
%patch21 -p1
+%ifarch aarch64
+%patch22 -p1 -b .orig
+%endif
+
+%ifarch armv7hl aarch64
+%patch23 -p1 -b .24~
+%endif
%build
-# Patch 19 modifies build system
+# Patch 19 and 22 modify build system
perl boot
# Check if bootstrap is required, i.e. version is different from ghc's version
++ ghc-7.8-arm-use-ld-gold.patch ++
armv7 by nomeata: https://ghc.haskell.org/trac/ghc/ticket/8976#comment:12
arm64 backport of https://ghc.haskell.org/trac/ghc/ticket/9673#comment:28
(erikd)
--- ghc-7.8.4/aclocal.m4.24~2015-04-01 04:48:39.961193022 -0400
+++ ghc-7.8.4/aclocal.m42015-04-01 04:50:19.708203082 -0400
@@ -553,6 +553,14 @@
$3="$$3 -D_HPUX_SOURCE"
$5="$$5 -D_HPUX_SOURCE"
;;
+arm*)
+# On arm, link using gold
+$3="$$3 -fuse-ld=gold"
+;;
+aarch64*)
+# On arm, link using gold
+$3="$$3 -fuse-ld=gold"
+;;
esac
# If gcc knows about the stack protector, turn it off.
--- ghc-7.8.4/configure.ac~ 2014-12-22 14:08:24.0 -0500
+++ ghc-7.8.4/configure.ac 2015-04-22 00:08:54.646110535 -0400
@@ -587,7 +587,18 @@
dnl ** Which ld to use?
dnl --
FP_ARG_WITH_PATH_GNU_PROG([LD], [ld], [ld])
-LdCmd="$LD"
+case $target in
+arm*linux* | aarch64*linux*)
+ # Arm requires use of the binutils ld.gold linker.
+ # This case should catch at least arm-unknown-linux-gnueabihf and
+ # arm-linux-androideabi.
+ FP_ARG_WITH_PATH_GNU_PROG([LD_GOLD], [ld.gold], [ld.gold])
+ LdCmd="$LD_GOLD"
+ ;;
+*)
+ LdCmd="$LD"
+ ;;
+esac
AC_SUBST([LdCmd])
dnl ** Which nm to use?
++ ghc-config.mk.in-Enable-SMP-and-GHCi-support-for-Aarch64.patch ++
>From 44cee4852282f63393d532aad59c5cd865ff3ed6 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo
Date: Wed, 1 Apr 2015 04:46:01 +
Subject: [PATCH] mk/config.mk.in : Enable SMP and GHCi support for Aarch64.
---
mk/config.mk.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: ghc-7.8.4/mk/config.mk.in
===
--- ghc-7.8.4.orig/mk/config.mk.in
+++ ghc-7.8.4/mk/config.mk.in
@@ -174,7 +174,7 @@ HaveLibDL = @HaveLibDL@
# ArchSupportsSMP should be set iff there is support for that arch in
# includes/stg/SMP.h
-ArchSupportsSMP=$(strip $(patsubst $(TargetArc
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-06-06 09:54:26
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-05-27 12:49:51.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-06-06
09:54:33.0 +0200
@@ -1,0 +2,19 @@
+Fri May 29 05:47:07 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- refresh ghc-arm64.patch
+- unconditionally apply ghc-arm64.patch
+
+---
+Thu May 28 15:14:31 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- add backport of powerpc64le native code generator to
+ 0001-implement-native-code-generator-for-ppc64.patch
+- refresh D349.patch
+
+---
+Thu May 28 13:15:52 CEST 2015 - r...@suse.de
+
+- on s390/s390x use "make -j2" to stabilize abi hashes
+ (see also redhat bug 1212374)
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.tWQCDk/_old 2015-06-06 09:54:34.0 +0200
+++ /var/tmp/diff_new_pack.tWQCDk/_new 2015-06-06 09:54:34.0 +0200
@@ -16,7 +16,7 @@
#
-%global unregisterised_archs aarch64 ppc64le s390 s390x
+%global unregisterised_archs aarch64 s390 s390x
Name: ghc
Version:7.8.4
@@ -168,9 +168,7 @@
%patch18 -p1
%patch19 -p1
%patch20 -p1
-%ifarch aarch64
%patch21 -p1
-%endif
%build
# Patch 19 modifies build system
@@ -203,7 +201,11 @@
HSCOLOUR_SRCS= NO
EOF
./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi
+%ifnarch s390 s390x
make %{?_smp_mflags}
+%else
+make -j 2
+%endif
make install
make clean
%endif
@@ -254,7 +256,11 @@
%{?ghc_boot:--with-ghc=%{_builddir}/ghc-boot/bin/ghc} \
--with-system-libffi
+%ifnarch s390 s390x
make %{?_smp_mflags}
+%else
+make -j 2
+%endif
%install
%ghc_suse_disable_debug_packages
++ 0001-implement-native-code-generator-for-ppc64.patch ++
2393 lines (skipped)
between
/work/SRC/openSUSE:Factory/ghc/0001-implement-native-code-generator-for-ppc64.patch
and
/work/SRC/openSUSE:Factory/.ghc.new/0001-implement-native-code-generator-for-ppc64.patch
++ D349.patch ++
--- /var/tmp/diff_new_pack.tWQCDk/_old 2015-06-06 09:54:34.0 +0200
+++ /var/tmp/diff_new_pack.tWQCDk/_new 2015-06-06 09:54:34.0 +0200
@@ -1,7 +1,7 @@
-Index: ghc-7.8.3/compiler/ghci/Linker.lhs
+Index: ghc-7.8.4/compiler/ghci/Linker.lhs
===
ghc-7.8.3.orig/compiler/ghci/Linker.lhs
-+++ ghc-7.8.3/compiler/ghci/Linker.lhs
+--- ghc-7.8.4.orig/compiler/ghci/Linker.lhs
ghc-7.8.4/compiler/ghci/Linker.lhs
@@ -123,7 +123,10 @@ data PersistentLinkerState
-- The currently-loaded packages; always object code
-- Held, as usual, in dependency order; though I am not sure if
@@ -172,11 +172,11 @@
Just err -> panic ("Loading temp shared object failed: " ++ err)
rmDupLinkables :: [Linkable]-- Already loaded
-Index: ghc-7.8.3/compiler/main/SysTools.lhs
+Index: ghc-7.8.4/compiler/main/SysTools.lhs
===
ghc-7.8.3.orig/compiler/main/SysTools.lhs
-+++ ghc-7.8.3/compiler/main/SysTools.lhs
-@@ -1365,6 +1365,7 @@ linkDynLib dflags0 o_files dep_packages
+--- ghc-7.8.4.orig/compiler/main/SysTools.lhs
ghc-7.8.4/compiler/main/SysTools.lhs
+@@ -1416,6 +1416,7 @@ linkDynLib dflags0 o_files dep_packages
in package_hs_libs ++ extra_libs ++ other_flags
-- probably _stub.o files
@@ -184,7 +184,7 @@
let extra_ld_inputs = ldInputs dflags
case os of
-@@ -1482,8 +1483,8 @@ linkDynLib dflags0 o_files dep_packages
+@@ -1533,8 +1534,8 @@ linkDynLib dflags0 o_files dep_packages
-- Set the library soname. We use -h rather than -soname
as
-- Solaris 10 doesn't support the latter:
++ [ Option ("-Wl,-h," ++ takeFileName output_fn) ]
@@ -194,11 +194,11 @@
++ map Option pkg_lib_path_opts
++ map Option pkg_link_opts
)
-Index: ghc-7.8.3/rts/Linker.c
+Index: ghc-7.8.4/rts/Linker.c
===
ghc-7.8.3.orig/rts/Linker.c
-+++ ghc-7.8.3/rts/Linker.c
-@@ -1776,7 +1776,7 @@ internal_dlopen(const char *dll_name)
+--- ghc-7.8.4.orig/rts/Linker.c
ghc-7.8.4/rts/Linker.c
+@@ -1777,7 +1777,7 @@ internal_dlopen(const char *dll_n
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2015-05-27 12:49:50 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-05-22 16:37:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-05-27 12:49:51.0 +0200 @@ -1,0 +2,5 @@ +Tue May 26 09:19:09 UTC 2015 - mimi...@gmail.com + +- disable llvm on arm64 + +--- Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.1zcSU6/_old 2015-05-27 12:49:52.0 +0200 +++ /var/tmp/diff_new_pack.1zcSU6/_new 2015-05-27 12:49:52.0 +0200 @@ -34,7 +34,7 @@ BuildRequires: gmp-devel BuildRequires: libelf-devel BuildRequires: libffi-devel -%ifnarch ppc +%ifnarch ppc aarch64 BuildRequires: llvm %endif BuildRequires: ncurses-devel
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-05-22 16:37:09
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-05-10 10:45:59.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-05-22
16:37:19.0 +0200
@@ -1,0 +2,11 @@
+Thu May 21 23:32:56 CEST 2015 - r...@suse.de
+
+- re-diffed ghc-arm64.patch
+
+---
+Thu May 21 18:56:26 CEST 2015 - r...@suse.de
+
+- add ghc-arm64.patch for aarch64
+- add aarch64, s390, s390x to ExclusiveArch
+
+---
New:
ghc-arm64.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.5JBtBz/_old 2015-05-22 16:37:20.0 +0200
+++ /var/tmp/diff_new_pack.5JBtBz/_new 2015-05-22 16:37:20.0 +0200
@@ -16,7 +16,7 @@
#
-%global unregisterised_archs ppc64le s390 s390s
+%global unregisterised_archs aarch64 ppc64le s390 s390x
Name: ghc
Version:7.8.4
@@ -25,7 +25,7 @@
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
Group: Development/Languages/Other
-ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le
+ExclusiveArch: aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390 s390x
BuildRequires: binutils-devel
BuildRequires: gcc
BuildRequires: ghc-bootstrap >= 7.4
@@ -69,6 +69,8 @@
Patch19:0001-implement-native-code-generator-for-ppc64.patch
# PATCH-FIX-UPSTREAM ghc-glibc-2.20_BSD_SOURCE.patch
peter.tromm...@ohm-hochschule.de -- Define _DEFAULT_SOURCE in Stg.h to avoid
warnings from glibc. Fedora patch
Patch20:ghc-glibc-2.20_BSD_SOURCE.patch
+# PATCH-FIX-OPENSUSE add aarch64 support
+Patch21:ghc-arm64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -166,6 +168,9 @@
%patch18 -p1
%patch19 -p1
%patch20 -p1
+%ifarch aarch64
+%patch21 -p1
+%endif
%build
# Patch 19 modifies build system
++ ghc-arm64.patch ++
commit c29bf984dd20431cd4344e8a5c444d7a5be08389
Author: Colin Watson
Date: Mon Apr 21 22:26:56 2014 -0500
Bug: https://ghc.haskell.org/trac/ghc/ticket/7942
ghc: initial AArch64 patches
Signed-off-by: Austin Seipp
Index: ghc-7.8.3/aclocal.m4
--- ghc-7.8.4/aclocal.m4
+++ ghc-7.8.4/aclocal.m4
@@ -197,6 +197,9 @@
GET_ARM_ISA()
test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA,
armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""
;;
+aarch64)
+test -z "[$]2" || eval "[$]2=ArchARM64"
+;;
alpha)
test -z "[$]2" || eval "[$]2=ArchAlpha"
;;
@@ -1862,6 +1865,9 @@
# converts cpu from gnu to ghc naming, and assigns the result to $target_var
AC_DEFUN([GHC_CONVERT_CPU],[
case "$1" in
+ aarch64*)
+$2="aarch64"
+;;
alpha*)
$2="alpha"
;;
--- ghc-7.8.4/compiler/nativeGen/AsmCodeGen.lhs
+++ ghc-7.8.4/compiler/nativeGen/AsmCodeGen.lhs
@@ -166,6 +166,7 @@
ArchPPC -> nCG' (ppcNcgImpldflags)
ArchSPARC -> nCG' (sparcNcgImpl dflags)
ArchARM {} -> panic "nativeCodeGen: No NCG for ARM"
+ ArchARM64 -> panic "nativeCodeGen: No NCG for ARM64"
ArchPPC_64 -> nCG' (ppcNcgImpldflags)
ArchAlpha -> panic "nativeCodeGen: No NCG for Alpha"
ArchMipseb -> panic "nativeCodeGen: No NCG for mipseb"
--- ghc-7.8.4/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs
+++ ghc-7.8.4/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs
@@ -113,6 +113,7 @@
ArchSPARC -> 14
ArchPPC_64-> panic "trivColorable ArchPPC_64"
ArchARM _ _ _ -> panic "trivColorable ArchARM"
+ArchARM64 -> panic "trivColorable ArchARM64"
ArchAlpha -> panic "trivColorable ArchAlpha"
ArchMipseb-> panic "trivColorable ArchMipseb"
ArchMipsel-> panic "trivColorable ArchMipsel"
@@ -137,6 +138,7 @@
ArchSPARC -> 22
ArchPPC_64-> panic "trivColorable ArchPPC_64"
ArchARM _ _ _ -> panic "trivColorable ArchARM"
+ArchARM64 -> panic "trivColorable ArchARM64"
ArchAlpha -> panic "trivColorable ArchAlpha"
ArchMipseb-> panic "triv
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-05-10 10:45:58
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-04-15 16:24:42.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-05-10
10:45:59.0 +0200
@@ -23,0 +24,31 @@
+Wed Feb 4 11:57:35 UTC 2015 - mimi...@gmail.com
+
++ add ghc-glibc-2.20_BSD_SOURCE.patch from fedora
+- updated to 7.8.4
++ removed D177.patch (in upstream)
++ removed D173.patch (in upstream)
++ removed ghc.git-e18525f.patch (in upstream)
++ refresh 0001-implement-native-code-generator-for-ppc64.patch
+* A critical bug in the LLVM backend which would cause the compiler to
generate incorrect code has been fixed (issue #9439).
+* Several bugs in the code generator have been fixed for unregisterised
platforms, such as 64bit PowerPC (issue #8819 and #8849).
+* A bug that could cause GHC's constructor specialization pass (enabled by
default at -O2, or via -fspec-constr) to loop forever and consume large amounts
of memory has been fixed (issue #8960).
+* A bug that would cause GHC to fail when attempting to determine GCC's
version information in non-english locales has been fixed (issue #8825).
+* A minor bug that allowed GHC to seemingly import (but not use) private data
constructors has been fixed (issue #9006).
+* A bug in the register allocator which would cause GHC to crash during
compilation has been fixed (issue #9303).
+* A bug that caused the compiler to panic on some input C-- code has been
fixed (issue #9329).
+* A few various minor deadlocks in the runtime system when using forkProcess
have been fixed.
+* A bug which made blocked STM transactions non-interruptible has been fixed
(issue #9379).
+* A bug in the compiler which broke pattern synonym imports across modules in
Haddock has been fixed (issue #9417).
+* A minor bug in the code generator in which the popCnt16# did not zero-extend
its result has been fixed (issue #9435).
+* A bug which caused the compiler to panic on pattern synonyms inside a class
declaration has been fixed (issue #9705).
+* A bug in the typechecker revolving around un-saturated type family
applications has been fixed (issue #9433).
+* Several bugs have been fixed causing problems with building GHC on ARM
(issues #8951, #9620, #9336, and #9552).
+* A bug in the typechecker that could cause an infinite loop when using
superclasses in a cycle has been fixed (issue #9415).
+* A bug causing corruption in signal handling with the single-threaded runtime
system has been fixed (issue #9817).
+* A bug that could cause compiled programs to crash due to use of overlapping
type families has been fixed (issue #9371).
+* A bug in the inliner that caused certain expressions within unboxed tuples
to not be properly evaluated has been fixed (issue #9390).
+* A bug that caused the compiler to not always properly detect LLVM tools
(particularly on Windows) has been fixed (issue #7143).
+* A bug that prevented GHC from deriving Generic1 instances for data families
has been fixed (#9563).
+* A bug that caused type inference to infer the incorrect type in the presence
of certain type families and constraints has been fixed (issue #9316).
+
+---
Old:
D173.patch
D177.patch
ghc-7.8.3-src.tar.xz
ghc.git-e18525f.patch
New:
ghc-7.8.4-src.tar.xz
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.ad4ETW/_old 2015-05-10 10:46:00.0 +0200
+++ /var/tmp/diff_new_pack.ad4ETW/_new 2015-05-10 10:46:00.0 +0200
@@ -19,14 +19,13 @@
%global unregisterised_archs ppc64le s390 s390s
Name: ghc
-Version:7.8.3
+Version:7.8.4
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
Group: Development/Languages/Other
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le
-
BuildRequires: binutils-devel
BuildRequires: gcc
BuildRequires: ghc-bootstrap >= 7.4
@@ -35,6 +34,9 @@
BuildRequires: gmp-devel
BuildRequires: libelf-devel
BuildRequires: libffi-devel
+%ifnarch ppc
+BuildRequires: llvm
+%endif
BuildRequires: ncurses-devel
BuildRequires: pkg-config
BuildRequires: xz
@@ -61,12 +63,6 @@
Patch13:integer-gmp.patch
# PATCH-FIX-UPSTREAM ghc-7.8.2-cgen-constify.patch
peter.tromm...@ohm-hochschule.de - Make constant strings constant in C backend
to save data segment space. This is a gentoo patch.
Patch14:
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-04-15 16:24:41
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-03-23 12:19:39.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-04-15
16:24:42.0 +0200
@@ -1,0 +2,10 @@
+Tue Apr 14 11:26:18 UTC 2015 - mimi...@gmail.com
+
+- remove unneeded conditions
+
+---
+Mon Apr 13 14:57:55 UTC 2015 - mimi...@gmail.com
+
+- chnage constraints to 12G for disk and 4G for ram
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.Ss0XGW/_old 2015-04-15 16:24:43.0 +0200
+++ /var/tmp/diff_new_pack.Ss0XGW/_new 2015-04-15 16:24:43.0 +0200
@@ -370,16 +370,12 @@
%{_bindir}/hp2ps
%{_bindir}/hpc
%{_bindir}/hsc2hs
-%if 0%{suse_version} >= 1220
%ghost %{_sysconfdir}/alternatives/hsc2hs
-%endif
%{_bindir}/hsc2hs-ghc
%{_bindir}/runghc
%{_bindir}/runghc-%{version}
%{_bindir}/runhaskell
-%if 0%{suse_version} >= 1220
%ghost %{_sysconfdir}/alternatives/runhaskell
-%endif
%{_bindir}/runhaskell-ghc
%dir %{ghclibdir}
%{ghclibdir}/settings
++ _constraints ++
--- /var/tmp/diff_new_pack.Ss0XGW/_old 2015-04-15 16:24:43.0 +0200
+++ /var/tmp/diff_new_pack.Ss0XGW/_new 2015-04-15 16:24:43.0 +0200
@@ -1,7 +1,10 @@
- 8
+ 12
+
+ 4
+
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-03-23 12:19:25
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-02-25 02:18:21.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-03-23
12:19:39.0 +0100
@@ -1,0 +2,6 @@
+Sun Mar 15 13:25:32 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- add ghc-glibc-2.20_BSD_SOURCE.patch
+* fixes build on unregisterised architectures (openSUSE: ppc64le)
+
+---
New:
ghc-glibc-2.20_BSD_SOURCE.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.s1cbBL/_old 2015-03-23 12:19:40.0 +0100
+++ /var/tmp/diff_new_pack.s1cbBL/_new 2015-03-23 12:19:40.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -71,6 +71,8 @@
Patch18:D560.patch
# PATCH-FEATURE-UPSTREAM 0001-implement-native-code-generator-for-ppc64.patch
peter.tromm...@ohm-hochschule.de -- Implement native code generator for ppc64.
Haskell Trac #9863.
Patch19:0001-implement-native-code-generator-for-ppc64.patch
+# PATCH-FIX-UPSTREAM ghc-glibc-2.20_BSD_SOURCE.patch
peter.tromm...@ohm-hochschule.de -- Define _DEFAULT_SOURCE in Stg.h to avoid
warnings from glibc. Fedora patch
+Patch20:ghc-glibc-2.20_BSD_SOURCE.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -170,6 +172,7 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
%build
# Patch 19 modifies build system
++ ghc-glibc-2.20_BSD_SOURCE.patch ++
>From 7d738547049e686be4d90a19dcb9520418d5f72d Mon Sep 17 00:00:00 2001
From: Jens Petersen
Date: Mon, 9 Jun 2014 15:48:41 +0900
Subject: [PATCH] define _DEFAULT_SOURCE in Stg.h to avoid warnings from glibc
2.20 (#9185)
---
includes/Stg.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/includes/Stg.h b/includes/Stg.h
index 1707c9b..fbcf643 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -47,6 +47,8 @@
// We need _BSD_SOURCE so that math.h defines things like gamma
// on Linux
# define _BSD_SOURCE
+// glibc 2.20 deprecates _BSD_SOURCE in favour of _DEFAULT_SOURCE
+# define _DEFAULT_SOURCE
#endif
#if IN_STG_CODE == 0 || defined(llvm_CC_FLAVOR)
--
1.9.3
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2015-02-25 02:17:46 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-02-05 11:00:50.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-02-25 02:18:21.0 +0100 @@ -1,0 +2,6 @@ +Mon Feb 23 16:48:10 UTC 2015 - peter.tromm...@ohm-hochschule.de + +- drop ghc-cabal-unversion-docdir.patch + * ghc-rpm-macros follows upstream ghc again + +--- Old: ghc-cabal-unversion-docdir.patch Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.KTZvYf/_old 2015-02-25 02:18:22.0 +0100 +++ /var/tmp/diff_new_pack.KTZvYf/_new 2015-02-25 02:18:22.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,8 +55,6 @@ Source1:ghc-rpmlintrc # PATCH-FIX-UPSTREAM llvm-powerpc64-datalayout.patch peter.tromm...@ohm-hochschule.de - Add target datalayout for llvm on powerpc 64. Patch8: llvm-powerpc64-datalayout.patch -# PATCH-FIX-OPENSUSE ghc-cabal-unversion-docdir.patch peter.tromm...@ohm-hochschule.de - Remove versions in library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can be removed once we move to ghc 7.8.x. Fedora patch 16. -Patch9: ghc-cabal-unversion-docdir.patch # PATCH-FIX-UPSTREAM D349.patch peter.tromm...@ohm-hochschule.de - Fix dynamic linker, see Haskell trac #8935. Patch12:D349.patch # PATCH-FIX-UPSTREAM integer-gmp.patch peter.tromm...@ohm-hochschule.de -- Fix upstream ticket #8156 see https://ghc.haskell.org/trac/ghc/ticket/8156. We need this for SLE 11 where libgmp is too old and so we have to use the bundled libgmp. This patch fixes the build. @@ -164,7 +162,6 @@ %prep %setup -q %patch8 -p1 -%patch9 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-02-05 11:00:47
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2015-01-29 09:58:25.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-02-05
11:00:50.0 +0100
@@ -1,0 +2,10 @@
+Tue Feb 3 13:35:25 UTC 2015 - mimi...@gmail.com
+
+- add constraints file
+
+---
+Tue Feb 3 12:05:21 UTC 2015 - mimi...@gmail.com
+
+- remove dblatex dependency
+
+---
New:
_constraints
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.lluy1l/_old 2015-02-05 11:00:51.0 +0100
+++ /var/tmp/diff_new_pack.lluy1l/_new 2015-02-05 11:00:51.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -39,9 +39,6 @@
BuildRequires: pkg-config
BuildRequires: xz
%if %{undefined without_manual}
-%if 0%{suse_version} >= 1220
-BuildRequires: dblatex
-%endif
BuildRequires: docbook-utils
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
@@ -418,10 +415,6 @@
%if %{undefined without_manual}
%{ghcdocbasedir}/haddock
%{ghcdocbasedir}/users_guide
-%if 0%{suse_version} >= 1220
-%{_datadir}/doc/ghc/haddock*
-%{_datadir}/doc/ghc/users_guide*
-%endif
%endif
%{ghcdocbasedir}/libraries/frames.html
%{ghcdocbasedir}/libraries/gen_contents_index
++ _constraints ++
8
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2015-01-29 09:58:08
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2014-12-16 14:48:55.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2015-01-29
09:58:25.0 +0100
@@ -1,0 +2,7 @@
+Mon Jan 12 14:20:32 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- add patch 0001-implement-native-code-generator-for-ppc64.patch
+* native code generation improved compilation speed
+* fewer errors in testsuite than with C back end
+
+---
New:
0001-implement-native-code-generator-for-ppc64.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.Yvc1eG/_old 2015-01-29 09:58:27.0 +0100
+++ /var/tmp/diff_new_pack.Yvc1eG/_new 2015-01-29 09:58:27.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
-%global unregisterised_archs ppc64 ppc64le s390 s390s
+%global unregisterised_archs ppc64le s390 s390s
Name: ghc
Version:7.8.3
@@ -46,6 +46,9 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
%endif
+# Patch 19 changes build system
+BuildRequires: autoconf
+BuildRequires: automake
PreReq: update-alternatives
Requires: ghc-compiler = %{version}-%{release}
@@ -71,6 +74,8 @@
Patch17:ghc.git-e18525f.patch
# PATCH-FIX-UPSTREAM D560.patch peter.tromm...@ohm-hochschule.de -- Fix
loading of PIC register. See https://phabricator.haskell.org/D560.
Patch18:D560.patch
+# PATCH-FEATURE-UPSTREAM 0001-implement-native-code-generator-for-ppc64.patch
peter.tromm...@ohm-hochschule.de -- Implement native code generator for ppc64.
Haskell Trac #9863.
+Patch19:0001-implement-native-code-generator-for-ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -170,8 +175,12 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
+%patch19 -p1
%build
+# Patch 19 modifies build system
+perl boot
+
# 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)"
++ 0001-implement-native-code-generator-for-ppc64.patch ++
1917 lines (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2014-12-16 14:48:50
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2014-11-26 10:32:55.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2014-12-16
14:48:55.0 +0100
@@ -1,0 +2,8 @@
+Sat Dec 13 09:36:11 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- add patch D560.patch
+* fixes dynamic linking on ppc
+* see https://phabricator.haskell.org/D560
+* this is a back port of the upstream patch
+
+---
New:
D560.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.UW1akg/_old 2014-12-16 14:48:57.0 +0100
+++ /var/tmp/diff_new_pack.UW1akg/_new 2014-12-16 14:48:57.0 +0100
@@ -67,8 +67,10 @@
Patch15:D173.patch
# PATCH-FIX-UPSTREAM D177.patch peter.tromm...@ohm-hochschule.de -- Pass PIC
flags to assembler. See https://phabricator.haskell.org/D177.
Patch16:D177.patch
-# PATCH-FIX-UPSTREAM ghc.git-e18525f.patch peter.tromm...@ohm-hochscule.de --
Declare extern cmm primitives as functions not data. Backport of upstream fix
for 7.10. See
https://git.haskell.org/ghc.git/commitdiff_plain/e18525fae273f4c1ad8d6cbe1dea4fc074cac721.
+# PATCH-FIX-UPSTREAM ghc.git-e18525f.patch peter.tromm...@ohm-hochschule.de --
Declare extern cmm primitives as functions not data. Backport of upstream fix
for 7.10. See
https://git.haskell.org/ghc.git/commitdiff_plain/e18525fae273f4c1ad8d6cbe1dea4fc074cac721.
Patch17:ghc.git-e18525f.patch
+# PATCH-FIX-UPSTREAM D560.patch peter.tromm...@ohm-hochschule.de -- Fix
loading of PIC register. See https://phabricator.haskell.org/D560.
+Patch18:D560.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -167,6 +169,7 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
%build
# Check if bootstrap is required, i.e. version is different from ghc's version
++ D560.patch ++
Index: ghc-7.8.3/compiler/cmm/CLabel.hs
===
--- ghc-7.8.3.orig/compiler/cmm/CLabel.hs
+++ ghc-7.8.3/compiler/cmm/CLabel.hs
@@ -1158,7 +1158,8 @@ pprDynamicLinkerAsmLabel platform dllInf
else if osElfTarget (platformOS platform)
then if platformArch platform == ArchPPC
then case dllInfo of
- CodeStub -> ppr lbl <> text "@plt"
+ CodeStub -> -- See Note [.LCTOC1 in PPC PIC code]
+ ppr lbl <> text "+32768@plt"
SymbolPtr -> text ".LC_" <> ppr lbl
_ -> panic "pprDynamicLinkerAsmLabel"
else if platformArch platform == ArchX86_64
Index: ghc-7.8.3/compiler/nativeGen/PIC.hs
===
--- ghc-7.8.3.orig/compiler/nativeGen/PIC.hs
+++ ghc-7.8.3/compiler/nativeGen/PIC.hs
@@ -54,7 +54,6 @@ import qualified X86.Instr as X86
import Platform
import Instruction
-import Size
import Reg
import NCGMonad
@@ -468,11 +467,8 @@ pprGotDeclaration dflags ArchX86 OSDarwi
pprGotDeclaration _ _ OSDarwin
= empty
--- pprGotDeclaration
+-- Emit GOT declaration
-- Output whatever needs to be output once per .s file.
--- The .LCTOC1 label is defined to point 32768 bytes into the table,
--- to make the most of the PPC's 16-bit displacements.
--- Only needed for PIC.
pprGotDeclaration dflags arch os
| osElfTarget os
, arch /= ArchPPC_64
@@ -482,6 +478,7 @@ pprGotDeclaration dflags arch os
| osElfTarget os
, arch /= ArchPPC_64
= vcat [
+-- See Note [.LCTOC1 in PPC PIC code]
ptext (sLit ".section \".got2\",\"aw\""),
ptext (sLit ".LCTOC1 = .+32768") ]
@@ -688,12 +685,7 @@ pprImportedSymbol _ _ _
-- Get a pointer to our own fake GOT, which is defined on a per-module basis.
--- This is exactly how GCC does it, and it's quite horrible:
--- We first fetch the address of a local label (mkPicBaseLabel).
--- Then we add a 16-bit offset to that to get the address of a .long that we
--- define in .text space right next to the proc. This .long literal contains
--- the (32-bit) offset from our local label to our global offset table
--- (.LCTOC1 aka gotOffLabel).
+-- This is exactly how GCC does it in linux.
initializePicBase_ppc
:: Arch -> OS -> Reg
@@ -704,18 +696,9 @@ initializePicBase_ppc ArchPPC os picReg
(CmmProc info lab live (ListGraph blocks) : statics)
| osElfTarget os
= d
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2014-11-26 10:32:51
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2014-09-23 10:42:41.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2014-11-26
10:32:55.0 +0100
@@ -1,0 +2,60 @@
+Wed Nov 5 17:10:14 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- add patch D349.patch
+* fix a crash with dynamic linking in GHCi when accessing the
+ process environment
+* our patch has been submitted upstream
+* see https://phabricator.haskell.org/D349
+
+---
+Sun Sep 28 07:56:51 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- ghc-rpm-macros use internal dependency generator now
+* simplifies spec file
+
+---
+Sat Sep 20 13:09:30 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- fix alternatives handling
+
+---
+Fri Sep 19 09:17:53 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- update to 7.8.3
+* needed for Haskell Platfoerm 2014.2.0.0
+* fixes bnc #726744
+* way smaller source tarball (windows binaries removed)
+* dynamic libraries, GHCi, and Template Haskell for ppc64 and ppc64le
+- drop ghc-ppc64le.patch (fixed upstream)
+- add integer-gmp.patch
+* build bundled libgmp on SLE 11 (system version is too old)
+* fixes build on x86_64
+* see upstream trac #8156
+- add ghc-7.8.2-cgen-constify.patch
+* C backend (ppc64, ppc64le): generate 'const' strings
+* reduce size of table of contents (TOC)
+- add D173.patch
+* fix C backend: generate literals of correct size
+* fixes lots of arithmetic failures and trac #8849
+* asked upstream to merge fix into 7.8.4
+- add D177.patch
+* pass PIC flags to assembler
+* shared libraries on ppc still broken (trac #8024)
+- add ghc.git-e18525f.patch
+* fix C backend: generate functions for cmm primitives
+- drop ghc-use-system-libffi.patch (included upstream)
+- drop ghc-suse-as-needed.patch (fixed upstream)
+- drop Cabal-fix-dynamic-exec-for-TH.patch (fixed upstream)
+- drop ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch (fixed upstream)
+- drop ghc-avoid-empty-llvm-used-definitions.patch (fixed upstream)
+- drop 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch
+* our patch was included upstream
+- drop 0001-Delete-spurious-comma-in-configure.ac.patch
+* our patch was included upstream
+-drop ghc-fix-infinite-loop-big-endian.patch (fixed upstream
+- refresh llvm-powerpc64-datalayout.patch
+* port to new LLVM backend
+- refresh ghc-cabal-unversion-docdir.patch
+* include original Fedora patch for 7.8.2
+
+---
Old:
0001-Delete-spurious-comma-in-configure.ac.patch
0001-Fix-detection-of-library-for-shm-on-openSUSE.patch
Cabal-fix-dynamic-exec-for-TH.patch
ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
ghc-7.6.3-src.tar.bz2
ghc-avoid-empty-llvm-used-definitions.patch
ghc-fix-infinite-loop-big-endian.patch
ghc-ppc64le.patch
ghc-suse-as-needed.patch
ghc-use-system-libffi.patch
New:
D173.patch
D177.patch
D349.patch
ghc-7.8.2-cgen-constify.patch
ghc-7.8.3-src.tar.xz
ghc.git-e18525f.patch
integer-gmp.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.vrQA4V/_old 2014-11-26 10:32:58.0 +0100
+++ /var/tmp/diff_new_pack.vrQA4V/_new 2014-11-26 10:32:58.0 +0100
@@ -18,12 +18,8 @@
%global unregisterised_archs ppc64 ppc64le s390 s390s
-%ifarch %{unregisterised_archs}
-%global ghc_without_shared 1
-%endif
-
Name: ghc
-Version:7.6.3
+Version:7.8.3
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Summary:The Glorious Glasgow Haskell Compiler
@@ -31,11 +27,9 @@
Group: Development/Languages/Other
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le
-BuildRequires: ghc-bootstrap >= 7.0
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: binutils-devel
BuildRequires: gcc
+BuildRequires: ghc-bootstrap >= 7.4
BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
@@ -43,6 +37,7 @@
BuildRequires: libffi-devel
BuildRequires: ncurses-devel
BuildRequires: pkg-config
+BuildRequires: xz
%if %{undefined without_manual}
%if 0%{suse_version} >= 1220
BuildRequires: dblatex
@@ -51,33 +46,29 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
%endif
+
PreReq: update-alternatives
R
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2014-09-23 10:42:21
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2014-08-01 07:08:29.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2014-09-23
10:42:41.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 16 19:17:05 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- bootstrap from ghc-bootstrap not ghc
+* remove BR loop ghc->ghc
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.vYK1G4/_old 2014-09-23 10:42:45.0 +0200
+++ /var/tmp/diff_new_pack.vYK1G4/_new 2014-09-23 10:42:45.0 +0200
@@ -31,40 +31,7 @@
Group: Development/Languages/Other
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le
-BuildRequires: ghc-bytestring-devel
-BuildRequires: ghc-compiler >= 7.0
-BuildRequires: ghc-containers-devel
-BuildRequires: ghc-directory-devel
-BuildRequires: ghc-haskell98-devel
-BuildRequires: ghc-pretty-devel
-BuildRequires: ghc-process-devel
-# These are needed so OBS will keep those packages
-# Alternatively a Keep: line could be added to prjconf
-%if 0%{?opensuse_bs}
-BuildRequires: ghc-array-devel
-BuildRequires: ghc-base-devel
-BuildRequires: ghc-binary-devel
-BuildRequires: ghc-deepseq-devel
-BuildRequires: ghc-filepath-devel
-BuildRequires: ghc-old-locale-devel
-BuildRequires: ghc-old-time-devel
-BuildRequires: ghc-time-devel
-BuildRequires: ghc-unix-devel
-%if %{undefined without_hscolour}
-BuildRequires: ghc-array
-BuildRequires: ghc-base
-BuildRequires: ghc-containers
-BuildRequires: ghc-deepseq
-BuildRequires: ghc-directory
-BuildRequires: ghc-filepath
-BuildRequires: ghc-haskell98
-BuildRequires: ghc-old-locale
-BuildRequires: ghc-old-time
-BuildRequires: ghc-process
-BuildRequires: ghc-time
-BuildRequires: ghc-unix
-%endif
-%endif
+BuildRequires: ghc-bootstrap >= 7.0
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: binutils-devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2014-08-01 07:08:12
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2014-05-13 20:43:59.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2014-08-01
07:08:29.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 31 14:09:44 UTC 2014 - dims...@opensuse.org
+
+- Rename rpmlintrc to %{name}-rpmlintrc.
+ Follow the packaging guidelines.
+
+---
Old:
rpmlintrc
New:
ghc-rpmlintrc
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.B6frrv/_old 2014-08-01 07:08:31.0 +0200
+++ /var/tmp/diff_new_pack.B6frrv/_new 2014-08-01 07:08:31.0 +0200
@@ -89,6 +89,7 @@
Requires: ghc-ghc-devel = %{version}-%{release}
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
+Source1:ghc-rpmlintrc
# PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch
peter.tromm...@ohm-hochschule.de - See Haskell trac #4496 and #5743; backport
of our patch accepted upstream for next major release.
Patch: ghc-use-system-libffi.patch
# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.tromm...@ohm-hochschule.de
- temporary fix for Haskell trac #7062, ghc libraries do not work with
as_needed and new-dtags both enabled
++ ghc-rpmlintrc ++
addFilter("devel-file-in-non-devel-package")
addFilter("static-library-without-debuginfo")
# ghc-compiler has devel-dependency
addFilter("devel-dependency")
# Haskell needs executable stack
addFilter("executable-stack")
# Regrettably, upstream does not provide man pages for all executables
addFilter("no-manual-page-for-binary")
# Prevent warning about ghc containing no binary (it is a metapackage)
addFilter("no-binary")
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2014-05-13 20:43:57
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-12-19 21:36:56.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2014-05-13
20:43:59.0 +0200
@@ -1,0 +2,5 @@
+Sat May 10 19:30:44 UTC 2014 - dval...@suse.com
+
+- Enable ppc64le (ghc-ppc64le.patch)
+
+---
New:
ghc-ppc64le.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.8DFdwN/_old 2014-05-13 20:44:02.0 +0200
+++ /var/tmp/diff_new_pack.8DFdwN/_new 2014-05-13 20:44:02.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
-%global unregisterised_archs ppc64 s390 s390s
+%global unregisterised_archs ppc64 ppc64le s390 s390s
%ifarch %{unregisterised_archs}
%global ghc_without_shared 1
@@ -29,7 +29,7 @@
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
Group: Development/Languages/Other
-ExclusiveArch: %{ix86} x86_64 ppc ppc64
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-compiler >= 7.0
@@ -109,6 +109,7 @@
Patch8: llvm-powerpc64-datalayout.patch
# PATCH-FIX-OPENSUSE peter.tromm...@ohm-hochschule.de - Remove versions in
library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can
be removed once we move to ghc 7.8.x. Fedora patch 16.
Patch9: ghc-cabal-unversion-docdir.patch
+Patch10:ghc-ppc64le.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -212,6 +213,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
# required for patch and patch1
++ ghc-ppc64le.patch ++
Index: ghc-7.6.3/aclocal.m4
===
--- ghc-7.6.3.orig/aclocal.m4
+++ ghc-7.6.3/aclocal.m4
@@ -173,7 +173,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
GET_ARM_ISA()
test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA,
armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""
;;
-
alpha|mips|mipseb|mipsel|hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax)
+
alpha|mips|mipseb|mipsel|hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sparc64|vax)
test -z "[$]2" || eval "[$]2=ArchUnknown"
;;
*)
@@ -1883,6 +1883,9 @@ case "$1" in
mips*)
$2="mips"
;;
+ powerpc64le*)
+$2="powerpc64le"
+;;
powerpc64*)
$2="powerpc64"
;;
Index: ghc-7.6.3/includes/Stg.h
===
--- ghc-7.6.3.orig/includes/Stg.h
+++ ghc-7.6.3/includes/Stg.h
@@ -213,7 +213,7 @@ typedef StgFunPtr F_;
#define II_(X) static StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
#define IF_(f)static StgFunPtr GNUC3_ATTRIBUTE(used) f(void)
#define FN_(f)StgFunPtr f(void)
-#define EF_(f)extern StgFunPtr f(void)
+#define EF_(f)extern StgFunPtr f()
/*
-
Tail calls
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2013-12-19 21:36:55
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-10-31 09:01:14.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-12-19
21:36:56.0 +0100
@@ -1,0 +2,35 @@
+Mon Dec 16 15:03:42 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- use correct setting for unregisterised builds (ppc64)
+- simplify build setup (generation of mk/build.mk)
+
+---
+Mon Dec 16 10:56:21 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- don't BR llvm for now
+- dblatex broken on older openSUSE
+
+---
+Sun Dec 15 10:55:50 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- revert LLVM for ppc64 (segfaults during package install)
+- fix setting up build.mk
+- build perf for all archs
+
+---
+Sat Dec 14 08:38:43 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- Add llvm-powerpc64-datalayout.patch
+* fix LLVM backend for powerpc64
+- build and test LLVM backend on powerpc64
+
+---
+Fri Dec 13 21:59:10 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- Add cabal-unversion-docdir.patch
+* ghc-rpm-macros don't include versions in package docdirs
+ starting with version 1.0
+- use standard docdir for ghc
+- package pdf and ps manuals
+
+---
New:
ghc-cabal-unversion-docdir.patch
llvm-powerpc64-datalayout.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.VgtYY5/_old 2013-12-19 21:36:59.0 +0100
+++ /var/tmp/diff_new_pack.VgtYY5/_new 2013-12-19 21:36:59.0 +0100
@@ -77,6 +77,9 @@
BuildRequires: ncurses-devel
BuildRequires: pkg-config
%if %{undefined without_manual}
+%if 0%{suse_version} >= 1220
+BuildRequires: dblatex
+%endif
BuildRequires: docbook-utils
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
@@ -102,6 +105,10 @@
Patch6: 0001-Delete-spurious-comma-in-configure.ac.patch
# PATCH-FIX-UPSTREAM peter.tromm...@ohm-hochschule.de - Fix Haskell trac #8134.
Patch7: ghc-fix-infinite-loop-big-endian.patch
+# PATCH-FIX-UPSTREAM peter.tromm...@ohm-hochschule.de - Add target datalayout
for llvm on powerpc 64.
+Patch8: llvm-powerpc64-datalayout.patch
+# PATCH-FIX-OPENSUSE peter.tromm...@ohm-hochschule.de - Remove versions in
library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can
be removed once we move to ghc 7.8.x. Fedora patch 16.
+Patch9: ghc-cabal-unversion-docdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -203,6 +210,8 @@
%patch5 -p1 -b .shm
%patch6 -p1 -b .comma
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%build
# required for patch and patch1
@@ -231,15 +240,26 @@
make clean
%endif
-# http://hackage.haskell.org/trac/ghc/wiki/Platforms
-# cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc
-cat > mk/build.mk << EOF
+cat > mk/build.mk <> mk/build.mk
+# override some settings
+cat >> mk/build.mk << EOF
GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p}
%ifarch %{unregisterised_archs}
-GhcUnregisterised=YES
+GhcUnregisterised= YES
+GhcWithNativeCodeGen = NO
+SRC_HC_OPTS = -O -H64m
+GhcStage1HcOpts = -O
+GhcStage2HcOpts = -O2
+GhcHcOpts= -Rghc-timing
+GhcLibHcOpts = -O2
+SplitObjs= NO
%endif
%if %{defined without_haddock}
HADDOCK_DOCS = NO
@@ -251,8 +271,6 @@
HSCOLOUR_SRCS = NO
%endif
EOF
-# BuildFlavours are defined in mk/build.mk.sample
-cat mk/build.mk.sample >> mk/build.mk
export CFLAGS="${CFLAGS:-%optflags}"
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
@@ -260,7 +278,6 @@
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
- --docdir=%{ghcdocroot} \
%{?ghc_boot:--with-ghc=%{_builddir}/ghc-boot/bin/ghc} \
--with-system-libffi \
--with-gcc=%{_bindir}/gcc
@@ -394,7 +411,7 @@
%{ghclibdir}/runghc
%{ghclibdir}/template-hsc.h
%{ghclibdir}/unlit
-%dir %{ghcdocroot}
+%dir %{_datadir}/doc/ghc
%dir %{ghcdocbasedir}
%dir %{ghcdocbasedir}/libraries
%{_mandir}/man1/ghc.*
@@ -405,6 +422,10 @@
%{ghclibdir}/latex
%{ghclibdir}/haddock
%if %{undefined without_manual}
+%if 0%
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2013-10-31 09:01:13
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-09-29 19:23:26.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-10-31
09:01:14.0 +0100
@@ -1,0 +2,7 @@
+Mon Oct 28 18:24:46 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- Add ghc-fix-infinite-loop-big-endian.patch: Fix Haskell trac
+ #8134 on ppc64.
+- Enable threaded runtime on ppc64
+
+---
New:
ghc-fix-infinite-loop-big-endian.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.8WccGN/_old 2013-10-31 09:01:16.0 +0100
+++ /var/tmp/diff_new_pack.8WccGN/_new 2013-10-31 09:01:16.0 +0100
@@ -100,6 +100,8 @@
Patch5: 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch
# PATCH-FIX-UPSTREAM 0001-Delete-spurious-comma-in-configure.ac.patch
peter.tromm...@ohm-hochschule.de - Fix test for setitimer. Backported patch
sent upstream 2013-09-24, Haskell trac #8352
Patch6: 0001-Delete-spurious-comma-in-configure.ac.patch
+# PATCH-FIX-UPSTREAM peter.tromm...@ohm-hochschule.de - Fix Haskell trac #8134.
+Patch7: ghc-fix-infinite-loop-big-endian.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -200,6 +202,7 @@
%patch4 -p1 -b .llvm-empty
%patch5 -p1 -b .shm
%patch6 -p1 -b .comma
+%patch7 -p1
%build
# required for patch and patch1
@@ -217,13 +220,6 @@
%ifarch %{unregisterised_archs}
GhcUnregisterised=YES
%endif
-%ifarch ppc64
-GhcWithNativeCodeGen=NO
-SplitObjs=NO
-GhcRTSWays := debug
-GhcNotThreaded=YES
-GhcWithInterpreter=NO
-%endif
HADDOCK_DOCS = NO
BUILD_DOCBOOK_HTML = NO
HSCOLOUR_SRCS = NO
@@ -245,13 +241,6 @@
%ifarch %{unregisterised_archs}
GhcUnregisterised=YES
%endif
-%ifarch ppc64
-GhcWithNativeCodeGen=NO
-SplitObjs=NO
-GhcRTSWays := debug
-GhcNotThreaded=YES
-GhcWithInterpreter=NO
-%endif
%if %{defined without_haddock}
HADDOCK_DOCS = NO
%endif
@@ -432,6 +421,10 @@
%ghost %{ghcdocbasedir}/libraries/minus.gif
%ghost %{ghcdocbasedir}/libraries/plus.gif
%endif
+%if %{suse_version} >= 1230
+%ghost %{_sysconfdir}/alternatives/hsc2hs
+%ghost %{_sysconfdir}/alternatives/runhaskell
+%endif
%files libraries
%defattr(-,root,root,-)
++ ghc-fix-infinite-loop-big-endian.patch ++
>From 0a2e25ea54ab549ce0966ffe0ad40c80a2849032 Mon Sep 17 00:00:00 2001
From: Gustavo Luiz Duarte
Date: Mon, 28 Oct 2013 13:04:12 +
Subject: Fix infinite loop on 64 bits big endian platforms (Trac #8134)
---
rts/STM.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rts/STM.c b/rts/STM.c
index 6bcb7ba..c4dcb9f 100644
--- a/rts/STM.c
+++ b/rts/STM.c
@@ -927,7 +927,7 @@ void stmPreGCHook (Capability *cap) {
static volatile StgInt64 max_commits = 0;
#if defined(THREADED_RTS)
-static volatile StgBool token_locked = FALSE;
+static volatile StgWord token_locked = FALSE;
static void getTokenBatch(Capability *cap) {
while (cas((void *)&token_locked, FALSE, TRUE) == TRUE) { /* nothing */ }
--
1.8.3.1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2013-09-29 19:23:24
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-09-11 12:52:47.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-09-29
19:23:26.0 +0200
@@ -1,0 +2,24 @@
+Tue Sep 24 20:56:45 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- Add 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch:
+ Fix broken autoconf test for shm_* and librt. Haskell trac #8350
+- Add 0001-Delete-spurious-comma-in-configure.ac.patch:
+ Fix test for setitimer. Haskell trac #8352
+
+---
+Tue Sep 24 07:02:11 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- set up build.mk with configuration for ppc64
+* explicitly disable features that are not supported on ppc64
+
+---
+Mon Sep 23 17:32:52 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- add BR binutils-devel for bfd.h and libiberty
+
+---
+Mon Sep 23 14:27:19 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- add BR libelf-devel for nlist.h
+
+---
New:
0001-Delete-spurious-comma-in-configure.ac.patch
0001-Fix-detection-of-library-for-shm-on-openSUSE.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.VNP961/_old 2013-09-29 19:23:31.0 +0200
+++ /var/tmp/diff_new_pack.VNP961/_new 2013-09-29 19:23:31.0 +0200
@@ -16,6 +16,12 @@
#
+%global unregisterised_archs ppc64 s390 s390s
+
+%ifarch %{unregisterised_archs}
+%global ghc_without_shared 1
+%endif
+
Name: ghc
Version:7.6.3
Release:0
@@ -23,7 +29,7 @@
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
Group: Development/Languages/Other
-ExclusiveArch: %{ix86} x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc ppc64
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-compiler >= 7.0
@@ -61,10 +67,12 @@
%endif
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: binutils-devel
BuildRequires: gcc
BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
+BuildRequires: libelf-devel
BuildRequires: libffi-devel
BuildRequires: ncurses-devel
BuildRequires: pkg-config
@@ -88,6 +96,10 @@
Patch3: ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
# PATCH-FIX-UPSTREAM ghc-avoid-empty-llvm-used-definitions.patch
peter.tromm...@ohm-hochschule.de - Backport of commit db9b63105a54, fixes
Haskell trac #7996
Patch4: ghc-avoid-empty-llvm-used-definitions.patch
+# PATCH-FIX-UPSTREAM 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch
peter.tromm...@ohm-hochschule.de - Fix test for librt and shm_* detection.
Backported patch sent upstream 2013-09-24, Haskell trac #8350.
+Patch5: 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch
+# PATCH-FIX-UPSTREAM 0001-Delete-spurious-comma-in-configure.ac.patch
peter.tromm...@ohm-hochschule.de - Fix test for setitimer. Backported patch
sent upstream 2013-09-24, Haskell trac #8352
+Patch6: 0001-Delete-spurious-comma-in-configure.ac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -186,10 +198,15 @@
%patch2 -p1 -b .TH
%patch3 -p1 -b .llvm-version
%patch4 -p1 -b .llvm-empty
+%patch5 -p1 -b .shm
+%patch6 -p1 -b .comma
%build
# required for patch and patch1
-autoreconf -fi
+#autoreconf -fi
+
+# required for patch5 and patch6 and will run autoreconf for patch and patch1
+perl boot
# 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
@@ -197,6 +214,16 @@
%define ghc_boot 1
cat > mk/build.mk mk/build.mk << EOF
+%ifnarch %{unregisterised_archs}
BuildFlavour = perf
+%endif
GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p}
+%ifarch %{unregisterised_archs}
+GhcUnregisterised=YES
+%endif
+%ifarch ppc64
+GhcWithNativeCodeGen=NO
+SplitObjs=NO
+GhcRTSWays := debug
+GhcNotThreaded=YES
+GhcWithInterpreter=NO
+%endif
%if %{defined without_haddock}
HADDOCK_DOCS = NO
%endif
++ 0001-Delete-spurious-comma-in-configure.ac.patch ++
>From 8cf720ec511d22edb5f545b5b9847358533000d2 Mon Sep 17 00:00:00 2001
From: Peter Trommler
Date: Tu
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2013-09-11 12:52:45
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-09-08 11:30:21.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-09-11
12:52:47.0 +0200
@@ -1,0 +2,16 @@
+Tue Sep 10 16:21:19 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- Patches for llvm 3.3.
+* Add ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch: Silence warning
+ about llvm too new
+* Add ghc-avoid-empty-llvm-used-definitions.patch: Fix llvm code
+ generator. Backported patch for ghc 7.7 (cf Haskell trac #7996)
+- explicitly configure gcc location in bootstrap builds too
+- allow ppc builds (ppc64 build gets stuck)
+
+---
+Fri Sep 6 17:19:26 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- include BuildFlavour definitions in build.mk
+
+---
New:
ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
ghc-avoid-empty-llvm-used-definitions.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.5ftqpW/_old 2013-09-11 12:52:49.0 +0200
+++ /var/tmp/diff_new_pack.5ftqpW/_new 2013-09-11 12:52:49.0 +0200
@@ -23,7 +23,7 @@
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
Group: Development/Languages/Other
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 ppc
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-compiler >= 7.0
@@ -84,6 +84,10 @@
Patch1: ghc-suse-as-needed.patch
# PATCH-FIX-UPSTREAM Cabal-fix-dynamic-exec-for-TH.patch
peter.tromm...@ohm-hochschule.de - Fedora patch 10
Patch2: Cabal-fix-dynamic-exec-for-TH.patch
+# PATCH-FIX-UPSTREAM ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
peter.tromm...@ohm-hochschule.de - Fedora patch 14: Silence warning about llvm
3.3
+Patch3: ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
+# PATCH-FIX-UPSTREAM ghc-avoid-empty-llvm-used-definitions.patch
peter.tromm...@ohm-hochschule.de - Backport of commit db9b63105a54, fixes
Haskell trac #7996
+Patch4: ghc-avoid-empty-llvm-used-definitions.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -180,6 +184,8 @@
rm -r ghc-tarballs/libffi
%patch1 -p1 -b .suse
%patch2 -p1 -b .TH
+%patch3 -p1 -b .llvm-version
+%patch4 -p1 -b .llvm-empty
%build
# required for patch and patch1
@@ -195,7 +201,8 @@
BUILD_DOCBOOK_HTML = NO
HSCOLOUR_SRCS = NO
EOF
-./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi
+./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi \
+ --with-gcc=%{_bindir}/gcc
make %{?_smp_mflags}
make install
make clean
@@ -216,6 +223,8 @@
HSCOLOUR_SRCS = NO
%endif
EOF
+# BuildFlavours are defined in mk/build.mk.sample
+cat mk/build.mk.sample >> mk/build.mk
export CFLAGS="${CFLAGS:-%optflags}"
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
++ ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch ++
--- ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Base.hs~ 2013-04-19
06:22:46.0 +0900
+++ ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Base.hs 2013-07-24
17:05:06.491900335 +0900
@@ -151,7 +151,7 @@
minSupportLlvmVersion = 28
maxSupportLlvmVersion :: LlvmVersion
-maxSupportLlvmVersion = 31
+maxSupportLlvmVersion = 33
--
-- * Environment Handling
++ ghc-avoid-empty-llvm-used-definitions.patch ++
git-author:Geoffrey Mainland (06/12/13 13:31:49)
git-committer: Geoffrey Mainland (06/12/13 13:31:49)
Message:
Avoid generating empty llvm.used definitions.
LLVM 3.3rc3 complains when the llvm.used global is an empty array, so don't
define llvm.used at all when it would be empty.
--
Index: ghc-7.6.3/compiler/llvmGen/LlvmCodeGen.hs
===
--- ghc-7.6.3.orig/compiler/llvmGen/LlvmCodeGen.hs
+++ ghc-7.6.3/compiler/llvmGen/LlvmCodeGen.hs
@@ -112,19 +112,19 @@ cmmProcLlvmGens :: DynFlags -> BufHandle
-> [[LlvmVar]] -- ^ info tables that need to be marked as 'used'
-> IO ()
-cmmProcLlvmGens _ _ _ _ [] _ []
- = return ()
-
cmmProcLlvmGens dflags h _ _ [] _ ivars
- = let ivars' = concat ivars
-cast x = LMBitc (LMStaticPointer (pVarLift x)) i8Ptr
-ty = (LMArray (length ivars') i8Ptr)
-usedArray = LMStaticArray (map cast ivars') ty
-lmUsed = (LMGlobalVar (fsLit "llvm.used") ty Appending
- (Just $
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2013-09-08 11:30:20
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-08-01 17:14:25.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-09-08
11:30:21.0 +0200
@@ -1,0 +2,7 @@
+Tue Sep 3 20:46:48 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- build optimized compiler (BuildFlavour = perf)
+- bring back Fedora's Template Haskell patch
+- add Haskell trac ticket number to glibc-locale comment
+
+---
New:
Cabal-fix-dynamic-exec-for-TH.patch
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.SUwpxL/_old 2013-09-08 11:30:24.0 +0200
+++ /var/tmp/diff_new_pack.SUwpxL/_new 2013-09-08 11:30:24.0 +0200
@@ -80,8 +80,10 @@
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
# PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch
peter.tromm...@ohm-hochschule.de - See Haskell trac #4496 and #5743; backport
of our patch accepted upstream for next major release.
Patch: ghc-use-system-libffi.patch
-# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.tromm...@ohm-hochschule.de
-- temporary fix for Haskell trac #7062, ghc libraries do not work with
as_needed and new-dtags both enabled
+# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.tromm...@ohm-hochschule.de
- temporary fix for Haskell trac #7062, ghc libraries do not work with
as_needed and new-dtags both enabled
Patch1: ghc-suse-as-needed.patch
+# PATCH-FIX-UPSTREAM Cabal-fix-dynamic-exec-for-TH.patch
peter.tromm...@ohm-hochschule.de - Fedora patch 10
+Patch2: Cabal-fix-dynamic-exec-for-TH.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -109,7 +111,7 @@
Requires: ghc-base-devel
# This Requires fixes an issue in ghc's runtime system (rts) when
# locale files are missing. RTS loops and a memory leak eventually
-# exhausts all memory and the program crashes.
+# exhausts all memory and the program crashes. See Haskell trac #7695.
Requires: glibc-locale
Requires(post): update-alternatives
Requires(postun): update-alternatives
@@ -177,6 +179,7 @@
%patch -p1 -b .libffi
rm -r ghc-tarballs/libffi
%patch1 -p1 -b .suse
+%patch2 -p1 -b .TH
%build
# required for patch and patch1
@@ -201,6 +204,7 @@
# http://hackage.haskell.org/trac/ghc/wiki/Platforms
# cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc
cat > mk/build.mk << EOF
+BuildFlavour = perf
GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p}
%if %{defined without_haddock}
HADDOCK_DOCS = NO
++ Cabal-fix-dynamic-exec-for-TH.patch ++
--- ghc-7.6.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs~ 2013-04-19
06:32:04.0 +0900
+++ ghc-7.6.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs 2013-06-12
11:35:39.832840754 +0900
@@ -837,6 +837,8 @@
dynamicOpts = vanillaOpts `mappend` mempty {
ghcOptDynamic= toFlag True,
+ ghcOptHiSuffix = toFlag "dyn_hi",
+ ghcOptObjSuffix = toFlag "dyn_o",
ghcOptExtra = ghcSharedOptions exeBi
}
@@ -855,9 +857,9 @@
-- with profiling. This is because the code that TH needs to
-- run at compile time needs to be the vanilla ABI so it can
-- be loaded up and run by the compiler.
- when (withProfExe lbi &&
+ when ((withProfExe lbi || withDynExe lbi) &&
EnableExtension TemplateHaskell `elem` allExtensions exeBi) $
-runGhcProg exeProfOpts { ghcOptNoLink = toFlag True }
+runGhcProg vanillaOpts { ghcOptNoLink = toFlag True }
runGhcProg exeOpts { ghcOptOutputFile = toFlag (targetDir exeNameReal) }
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2013-08-01 17:14:19
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc"
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-06-05 11:52:03.0
+0200
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-08-01
17:14:25.0 +0200
@@ -2 +2 @@
-Sun May 19 07:05:39 UTC 2013 - peter.tromm...@ohm-hochschule.de
+Tue Jul 16 15:01:54 UTC 2013 - peter.tromm...@ohm-hochschule.de
@@ -4,2 +4 @@
-- ghc-pkg allocates memeory in an infinite loop and then crashes
- when glibc-locale is not installed, so require glibc-locale for
+- add comment to explain why glibc-locale is required by
@@ -6,0 +6,25 @@
+
+---
+Fri May 17 15:53:07 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- glibc-locale required by ghc-pkg
+
+---
+Fri May 3 07:38:55 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- update to 7.6.3 from upstream
+- part of Haskell Platform 2013.2
+- new languages features (polymorphic kinds, ...)
+- do compiler upgrade in one submit request by bootstrapping
+ ghc if necessary and use that ghc to selfbootstrap new
+ ghc
+- replaced ghc-use-system-libffi.patch with new patch for
+ Haskell trac #5743 (add configure option to use system libffi)
+- drop Cabal-fix-dynamic-exec-for-TH.patch: Fixed upstream
+- drop ghc-6.12.1-gen_contents_index-haddock-path.patch which used
+ system provided haddock and that causes trouble when bootstrapping
+- drop ghc-gen_contents_index-type-level.patch: fixed upstream
+- drop patch ghc-fix-undefined-openpty.patch: Fixed upstream
+- drop patch 0001-Add-missing-flag-for-respecting-EXTRA_LIBDIR.patch:
+ Fixed upstream
+- port to new ghc-rpm-macros
Old:
0001-Add-missing-flag-for-respecting-EXTRA_LIBDIR.patch
Cabal-fix-dynamic-exec-for-TH.patch
ghc-6.12.1-gen_contents_index-haddock-path.patch
ghc-7.4.2-src.tar.bz2
ghc-fix-undefined-openpty.patch
ghc-gen_contents_index-type-level.patch
New:
ghc-7.6.3-src.tar.bz2
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.pXBdga/_old 2013-08-01 17:14:27.0 +0200
+++ /var/tmp/diff_new_pack.pXBdga/_new 2013-08-01 17:14:27.0 +0200
@@ -16,14 +16,8 @@
#
-# To bootstrap a new version of ghc, uncomment the following:
-#%%global ghc_bootstrapping 1
-#%%{?ghc_bootstrap}
-#%%global without_hscolour 1
-#%%global without_manual 1
-
Name: ghc
-Version:7.4.2
+Version:7.6.3
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Summary:The Glorious Glasgow Haskell Compiler
@@ -31,12 +25,8 @@
Group: Development/Languages/Other
ExclusiveArch: %{ix86} x86_64
-%if %{defined ghc_bootstrapping}
-BuildRequires: ghc-compiler >= 6.12
-%else
-BuildRequires: ghc-compiler = %version
-%endif
BuildRequires: ghc-bytestring-devel
+BuildRequires: ghc-compiler >= 7.0
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-haskell98-devel
@@ -72,7 +62,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc
-BuildRequires: ghc-rpm-macros >= 0.91
+BuildRequires: ghc-rpm-macros-extra
BuildRequires: glibc-devel
BuildRequires: gmp-devel
BuildRequires: libffi-devel
@@ -83,26 +73,15 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
%endif
-%if %{undefined without_haddock} && %{undefined without_hscolour}
-BuildRequires: hscolour
-%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.bz2
-# PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch
peter.tromm...@ohm-hochschule.de - See Haskell trac #4496 and #5743
+# PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch
peter.tromm...@ohm-hochschule.de - See Haskell trac #4496 and #5743; backport
of our patch accepted upstream for next major release.
Patch: ghc-use-system-libffi.patch
# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.tromm...@ohm-hochschule.de
-- temporary fix for Haskell trac #7062, ghc libraries do not work with
as_needed and new-dtags both enabled
Patch1: ghc-suse-as-needed.patch
-# fedora patch 9: fix dynamic linking of executables using Template Haskell
-Patch2: Cabal-fix-dynamic-exec-for-TH.patch
-Patch3: ghc-6.12.1-gen_contents_index-haddo
commit ghc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2013-06-05 11:52:02 Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) Package is "ghc" Changes: --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-01-24 09:56:22.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-06-05 11:52:03.0 +0200 @@ -1,0 +2,7 @@ +Sun May 19 07:05:39 UTC 2013 - peter.tromm...@ohm-hochschule.de + +- ghc-pkg allocates memeory in an infinite loop and then crashes + when glibc-locale is not installed, so require glibc-locale for + ghc-compiler + +--- Other differences: -- ++ ghc.spec ++ --- /var/tmp/diff_new_pack.Q9897L/_old 2013-06-05 11:52:04.0 +0200 +++ /var/tmp/diff_new_pack.Q9897L/_new 2013-06-05 11:52:04.0 +0200 @@ -128,6 +128,7 @@ Group: Development/Languages/Other Requires: gcc Requires: ghc-base-devel +Requires: glibc-locale Requires(post): update-alternatives Requires(postun): update-alternatives -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2013-01-24 09:56:21
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2012-12-10 12:19:26.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-01-24
09:56:22.0 +0100
@@ -1,0 +2,5 @@
+Fri Jan 11 16:52:35 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- enable color and links in documentation
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.tgmWEK/_old 2013-01-24 09:56:23.0 +0100
+++ /var/tmp/diff_new_pack.tgmWEK/_new 2013-01-24 09:56:23.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,9 @@
# To bootstrap a new version of ghc, uncomment the following:
#%%global ghc_bootstrapping 1
#%%{?ghc_bootstrap}
-%global without_hscolour 1
+#%%global without_hscolour 1
#%%global without_manual 1
-#%%global debug_package %{nil}
-
Name: ghc
Version:7.4.2
Release:0
@@ -57,18 +55,18 @@
BuildRequires: ghc-time-devel
BuildRequires: ghc-unix-devel
%if %{undefined without_hscolour}
-# array
-# base
-# containers
-# deepseq
-# directory
-# filepath
-# haskell98
-# old-locale
-# old-time
-# process
-# time
-# unix
+BuildRequires: ghc-array
+BuildRequires: ghc-base
+BuildRequires: ghc-containers
+BuildRequires: ghc-deepseq
+BuildRequires: ghc-directory
+BuildRequires: ghc-filepath
+BuildRequires: ghc-haskell98
+BuildRequires: ghc-old-locale
+BuildRequires: ghc-old-time
+BuildRequires: ghc-process
+BuildRequires: ghc-time
+BuildRequires: ghc-unix
%endif
%endif
BuildRequires: autoconf
@@ -236,6 +234,7 @@
make %{?_smp_mflags}
%install
+%ghc_suse_disable_debug_packages
%makeinstall
for i in %{ghc_packages_list}; do
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2012-12-10 12:19:25
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2012-11-15 10:58:12.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2012-12-10
12:19:26.0 +0100
@@ -1,0 +2,16 @@
+Mon Dec 3 09:33:59 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- try to work around factory-auto still thinking we need
+ to wait for BRs even when those are in a comment
+
+---
+Wed Nov 28 08:30:30 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- help factory-auto by commenting out currently unneeded BRs
+
+---
+Tue Nov 13 10:20:38 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- selfbootstrap ghc 7.4.2
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.CVSSqR/_old 2012-12-10 12:19:28.0 +0100
+++ /var/tmp/diff_new_pack.CVSSqR/_new 2012-12-10 12:19:28.0 +0100
@@ -17,8 +17,8 @@
# To bootstrap a new version of ghc, uncomment the following:
-%global ghc_bootstrapping 1
-%{?ghc_bootstrap}
+#%%global ghc_bootstrapping 1
+#%%{?ghc_bootstrap}
%global without_hscolour 1
#%%global without_manual 1
@@ -48,6 +48,7 @@
# Alternatively a Keep: line could be added to prjconf
%if 0%{?opensuse_bs}
BuildRequires: ghc-array-devel
+BuildRequires: ghc-base-devel
BuildRequires: ghc-binary-devel
BuildRequires: ghc-deepseq-devel
BuildRequires: ghc-filepath-devel
@@ -56,18 +57,18 @@
BuildRequires: ghc-time-devel
BuildRequires: ghc-unix-devel
%if %{undefined without_hscolour}
-BuildRequires: ghc-array
-BuildRequires: ghc-base
-BuildRequires: ghc-containers
-BuildRequires: ghc-deepseq
-BuildRequires: ghc-directory
-BuildRequires: ghc-filepath
-BuildRequires: ghc-haskell98
-BuildRequires: ghc-old-locale
-BuildRequires: ghc-old-time
-BuildRequires: ghc-process
-BuildRequires: ghc-time
-BuildRequires: ghc-unix
+# array
+# base
+# containers
+# deepseq
+# directory
+# filepath
+# haskell98
+# old-locale
+# old-time
+# process
+# time
+# unix
%endif
%endif
BuildRequires: autoconf
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2012-11-15 10:58:10
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2012-11-08 07:59:25.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2012-11-15
10:58:12.0 +0100
@@ -1,0 +2,17 @@
+Mon Nov 12 12:53:10 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- remove binary distributions after bootstrap in Factory
+
+---
+Thu Nov 8 22:24:25 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- Update to version 7.4.2 from upstream
+* Required by Haskell Platform 2012.4.0.0
+* Fixes for ghc and ghci
+
+---
+Thu Nov 8 19:58:08 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- add ExclusiveArch tag
+
+---
Old:
ghc-7.4.1-i386-unknown-linux.tar.bz2
ghc-7.4.1-src.tar.bz2
ghc-7.4.1-x86_64-unknown-linux.tar.bz2
New:
ghc-7.4.2-src.tar.bz2
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.pPMI0G/_old 2012-11-15 10:58:21.0 +0100
+++ /var/tmp/diff_new_pack.pPMI0G/_new 2012-11-15 10:58:21.0 +0100
@@ -2,7 +2,6 @@
# spec file for package ghc
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2011, 2012 Peter Trommler peter.tromm...@ohm-hochschule.de
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,16 +25,14 @@
#%%global debug_package %{nil}
Name: ghc
-Version:7.4.1
+Version:7.4.2
Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Summary:The Glorious Glasgow Haskell Compiler
License:BSD-3-Clause
Group: Development/Languages/Other
+ExclusiveArch: %{ix86} x86_64
-# Remove after initial bootstrap
-%if %{defined without_binary_ghc}
-# end bootstrap
%if %{defined ghc_bootstrapping}
BuildRequires: ghc-compiler >= 6.12
%else
@@ -73,9 +70,6 @@
BuildRequires: ghc-unix
%endif
%endif
-# Remove after initial bootstrap
-%endif
-#end bootstrap
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc
@@ -98,12 +92,6 @@
Requires: ghc-ghc-devel = %{version}-%{release}
Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
-# remove after initial bootstrap
-# Binary distributions for initial bootstrap
-%global bootstrap_version %{version}
-Source1:%{name}-%{bootstrap_version}-%{_arch}-unknown-linux.tar.bz2
-# NoSource: 1
-# end bootstrap
# PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch
peter.tromm...@ohm-hochschule.de - See Haskell trac #4496 and #5743
Patch: ghc-use-system-libffi.patch
# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.tromm...@ohm-hochschule.de
-- temporary fix for Haskell trac #7062, ghc libraries do not work with
as_needed and new-dtags both enabled
@@ -153,22 +141,16 @@
%global ghc_version_override %{version}
-# Remove after initial bootstrap
-%if %{defined without_binary_ghc}
-# end bootstrap
%global _use_internal_dependency_generator 0
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides
%{buildroot}%{ghclibdir}
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires
%{buildroot}%{ghclibdir}
-# Remove after initial bootstrap
-%endif
-# end bootstrap
%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%if %{defined ghclibdir}
%ghc_lib_subpackage Cabal 1.14.0
%ghc_lib_subpackage array 0.4.0.0
-%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.5.0.0
+%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.5.1.0
%ghc_lib_subpackage binary 0.5.1.0
%ghc_lib_subpackage bytestring 0.9.2.1
%ghc_lib_subpackage containers 0.4.2.1
@@ -189,7 +171,7 @@
%ghc_lib_subpackage process 1.1.0.1
%ghc_lib_subpackage template-haskell 2.7.0.0
%ghc_lib_subpackage time 1.4
-%ghc_lib_subpackage unix 2.5.1.0
+%ghc_lib_subpackage unix 2.5.1.1
%endif
%global version %{ghc_version_override}
@@ -209,9 +191,6 @@
except the ghc library, which is installed by the toplevel ghc metapackage.
%prep
-# Remove after initial bootstrap
-%setup -q -T -c -n bootstrap -a 1
-#end bootstrap
%setup -q
rm -r ghc-tarballs/{mingw,perl}
%patch -p1 -b .libffi
@@ -226,13 +205,6 @@
%patch6 -p1
%build
-# Remove after initial bootstrap
commit ghc for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc for openSUSE:Factory checked in
at 2012-11-08 07:59:23
Comparing /work/SRC/openSUSE:Factory/ghc (Old)
and /work/SRC/openSUSE:Factory/.ghc.new (New)
Package is "ghc", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2012-11-05 14:54:49.0
+0100
+++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2012-11-08
07:59:25.0 +0100
@@ -1,0 +2,5 @@
+Tue Nov 6 14:41:06 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- generate debug packages for Factory
+
+---
Other differences:
--
++ ghc.spec ++
--- /var/tmp/diff_new_pack.i3YUMU/_old 2012-11-08 07:59:31.0 +0100
+++ /var/tmp/diff_new_pack.i3YUMU/_new 2012-11-08 07:59:31.0 +0100
@@ -1,6 +1,7 @@
#
# spec file for package ghc
#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011, 2012 Peter Trommler peter.tromm...@ohm-hochschule.de
#
# All modifications and additions to the file contributed by third parties
@@ -15,22 +16,22 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
# To bootstrap a new version of ghc, uncomment the following:
-#%%global ghc_bootstrapping 1
-#%%{?ghc_bootstrap}
+%global ghc_bootstrapping 1
+%{?ghc_bootstrap}
%global without_hscolour 1
#%%global without_manual 1
-%global debug_package %{nil}
-
+#%%global debug_package %{nil}
Name: ghc
Version:7.4.1
-Release:1
-Group: Development/Languages/Other
-License:BSD-3-Clause
+Release:0
Url:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Summary:The Glorious Glasgow Haskell Compiler
+License:BSD-3-Clause
+Group: Development/Languages/Other
# Remove after initial bootstrap
%if %{defined without_binary_ghc}
@@ -43,61 +44,59 @@
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
-BuildREquires: ghc-haskell98-devel
+BuildRequires: ghc-haskell98-devel
BuildRequires: ghc-pretty-devel
BuildRequires: ghc-process-devel
# These are needed so OBS will keep those packages
# Alternatively a Keep: line could be added to prjconf
%if 0%{?opensuse_bs}
-BuildRequires: ghc-filepath-devel
-BuildRequires: ghc-unix-devel
BuildRequires: ghc-array-devel
+BuildRequires: ghc-binary-devel
+BuildRequires: ghc-deepseq-devel
+BuildRequires: ghc-filepath-devel
BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-old-time-devel
-BuildRequires: ghc-random-devel
BuildRequires: ghc-time-devel
-BuildRequires: ghc-binary-devel
-BuildRequires: ghc-deepseq-devel
+BuildRequires: ghc-unix-devel
%if %{undefined without_hscolour}
-BuildRequires: ghc-containers
+BuildRequires: ghc-array
BuildRequires: ghc-base
+BuildRequires: ghc-containers
+BuildRequires: ghc-deepseq
+BuildRequires: ghc-directory
+BuildRequires: ghc-filepath
BuildRequires: ghc-haskell98
-BuildRequires: ghc-array
-BuildRequires: ghc-random
-BuildRequires: ghc-time
+BuildRequires: ghc-old-locale
+BuildRequires: ghc-old-time
BuildRequires: ghc-process
-BuildRequires: ghc-directory
+BuildRequires: ghc-time
BuildRequires: ghc-unix
-BuildRequires: ghc-old-time
-BuildRequires: ghc-old-locale
-BuildRequires: ghc-filepath
-BuildRequires: ghc-deepseq
%endif
%endif
# Remove after initial bootstrap
%endif
#end bootstrap
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc
BuildRequires: ghc-rpm-macros >= 0.91
+BuildRequires: glibc-devel
BuildRequires: gmp-devel
BuildRequires: libffi-devel
BuildRequires: ncurses-devel
-BuildRequires: gcc
BuildRequires: pkg-config
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: glibc-devel
%if %{undefined without_manual}
-BuildRequires: libxslt
-BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook-utils
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: libxslt
%endif
%if %{undefined without_haddock} && %{undefined without_hscolour}
BuildRequires: hscolour
%endif
PreReq: update-alternatives
Requires: ghc-compiler = %{version}-%{release}
-Requires: ghc-libraries = %{version}-%{release}
Requires: ghc-ghc-devel = %{version}-%{release}
+Requires: ghc-libraries = %{version}-%{release}
Source:
http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
# remove after initial bootstrap
# Binary distributions for initial bootstrap
@@ -139,7 +138,6 @@
%package compiler
Summary: GHC compiler and utilities
-License: BSD-3-Clause
Group: Development/Languages
