The package rpms/ghc9.4.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghc9.4.git/commit/?id=6aceec936fd...
https://src.fedoraproject.org/cgit/rpms/ghc9.4.git/commit/?id=06310c29194....
Change:
+%ifarch s390x
+%ifarch s390x
Thanks.
Full change:
============
commit 39fc38b580f4ae31e2d11650fc25040a5853f876
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Dec 26 15:10:04 2022 +0800
9.4.4 release
diff --git a/.gitignore b/.gitignore
index 9c52bed..a012342 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/ghc-9.4.1-src.tar.lz
/ghc-9.4.2-src.tar.lz
/ghc-9.4.3-src.tar.lz
+/ghc-9.4.4-src.tar.lz
diff --git a/ghc9.4.spec b/ghc9.4.spec
index fd5c311..825751c 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -95,12 +95,12 @@
%endif
Name: %{ghc_name}
-Version: 9.4.3
+Version: 9.4.4
# Since library subpackages are versioned:
# - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport
@@ -965,6 +965,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog
+* Mon Dec 26 2022 Jens Petersen <petersen(a)redhat.com> - 9.4.4-15
+-
https://www.haskell.org/ghc/blog/20221224-ghc-9.4.4-released.html
+-
https://downloads.haskell.org/~ghc/9.4.4/docs/users_guide/9.4.4-notes.html
+
* Tue Nov 22 2022 Florian Weimer <fweimer(a)redhat.com> - 9.4.3-14
- Avoid implicit declaration of exit in configure check
diff --git a/sources b/sources
index 9bcc882..2e5f5cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ghc-9.4.3-src.tar.lz) =
b9518993b5b003574d6a2d25fbffe1944b761b8e18460eeae39618c64168d97fb9f147c9a20ad7ae1686d0e555b7dfaca54ed0381180135c3df0911a92e07ee3
+SHA512 (ghc-9.4.4-src.tar.lz) =
acb1e98b32ec689d50ea01ca3084ac8dc6fb5c59babdd96a624954d96efed4b0dd4ccadcc8d9d65d21af8b558dfa30ed7dd06755e487a952677609dba9957897
commit 9279f9cfb5743b2b595670a039e1ac09a1b1133b
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Dec 26 15:09:23 2022 +0800
add changelog entry for 9.4.3-13
diff --git a/ghc9.4.spec b/ghc9.4.spec
index 7d1a2ae..fd5c311 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -968,6 +968,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
* Tue Nov 22 2022 Florian Weimer <fweimer(a)redhat.com> - 9.4.3-14
- Avoid implicit declaration of exit in configure check
+* Wed Nov 9 2022 Jens Petersen <petersen(a)redhat.com> - 9.4.3-13
+- epel9: disable hadrian for s390x (#2141054)
+- epel9: disable docs on s390x with make
+
* Fri Nov 4 2022 Jens Petersen <petersen(a)redhat.com> - 9.4.3-12
-
https://www.haskell.org/ghc/blog/20221103-ghc-9.4.3-released.html
-
https://downloads.haskell.org/~ghc/9.4.3/docs/users_guide/9.4.3-notes.html
commit 56e95e5d9474338c6ca570ae4c4338c85f63bd8e
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sun Dec 25 20:32:58 2022 +0800
comments: drop long retired archs and insert rts
diff --git a/ghc9.4.spec b/ghc9.4.spec
index d805ec6..7d1a2ae 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -143,7 +143,6 @@ Patch26: no-missing-haddock-file-warning.patch
# fedora ghc has been bootstrapped on
# %%{ix86} x86_64 ppc ppc64 armv7hl s390 s390x ppc64le aarch64
-# and retired arches: alpha sparcv9 armv5tel
# see also deprecated ghc_arches defined in ghc-srpm-macros
# /usr/lib/rpm/macros.d/macros.ghc-srpm
@@ -366,6 +365,7 @@ This provides the hadrian tool which can be used to build ghc.
%ghc_lib_subpackage -d -l BSD parsec-3.1.15.0
%ghc_lib_subpackage -d -l BSD pretty-1.1.3.6
%ghc_lib_subpackage -d -l %BSDHaskellReport process-1.6.16.0
+# see below for rts
%ghc_lib_subpackage -d -l BSD stm-2.5.1.0
%ghc_lib_subpackage -d -l BSD template-haskell-2.19.0.0
%ghc_lib_subpackage -d -l BSD -c ncurses-devel%{?_isa} terminfo-0.4.1.5
commit c4e0f48c4562a293267c805f42525680cfa09874
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Tue Nov 22 15:39:18 2022 +0100
Avoid implicit declaration of exit in configure check
Related to:
<
https://fedoraproject.org/wiki/Changes/PortingToModernC>
<
https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
diff --git a/ghc-configure-c99.patch b/ghc-configure-c99.patch
new file mode 100644
index 0000000..f771a9c
--- /dev/null
+++ b/ghc-configure-c99.patch
@@ -0,0 +1,70 @@
+Submitted upstream:
+
+ <
https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9394>
+
+From 6b218717ac85d6dc9104f470cac0b4fb594104f4 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer(a)redhat.com>
+Date: Tue, 22 Nov 2022 15:23:50 +0100
+Subject: [PATCH] m4/fp_leading_underscore.m4: Avoid implicit exit function
+ declaration
+Content-type: text/plain
+
+And switch to a new-style function definition.
+
+Fixes build issues with compilers that do not accept implicit function
+declarations.
+---
+ m4/fp_leading_underscore.m4 | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/m4/fp_leading_underscore.m4 b/m4/fp_leading_underscore.m4
+index fde57c7625..939cee3b69 100644
+--- a/m4/fp_leading_underscore.m4
++++ b/m4/fp_leading_underscore.m4
+@@ -32,17 +32,15 @@ struct nlist xYzzY1[] = {{"xYzzY1", 0},{0}};
+ struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}};
+ #endif
+
+-int main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ #if defined(HAVE_NLIST_H)
+ if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0)
+- exit(1);
++ return 1;
+ if(nlist(argv[0], xYzzY2) == 0 && xYzzY2[0].n_value != 0)
+- exit(0);
++ return 0;
+ #endif
+- exit(1);
++ return 1;
+
}]])],[fptools_cv_leading_underscore=yes],[fptools_cv_leading_underscore=no],[fptools_cv_leading_underscore=no])
+ ;;
+ esac]);
+diff -ur ghc-9.4.3.orig/configure ghc-9.4.3/configure
+--- ghc-9.4.3.orig/configure 2022-11-03 04:46:32.000000000 +0100
++++ ghc-9.4.3/configure 2022-11-22 16:37:07.812512120 +0100
+@@ -17095,17 +17101,15 @@
+ struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}};
+ #endif
+
+-int main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ #if defined(HAVE_NLIST_H)
+ if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0)
+- exit(1);
++ return 1;
+ if(nlist(argv[0], xYzzY2) == 0 && xYzzY2[0].n_value != 0)
+- exit(0);
++ return 0;
+ #endif
+- exit(1);
++ return 1;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
diff --git a/ghc9.4.spec b/ghc9.4.spec
index 76c024b..d805ec6 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -100,7 +100,7 @@ Version: 9.4.3
# - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport
@@ -124,6 +124,7 @@ Patch3: ghc-gen_contents_index-nodocs.patch
#
https://gitlab.haskell.org/ghc/ghc/-/issues/21485
Patch5:
https://gitlab.haskell.org/ghc/ghc/-/commit/6e12e3c178fe9ad16131eb3c089bd...
Patch7: ghc-compiler-enable-build-id.patch
+Patch8: ghc-configure-c99.patch
# arm patches
Patch12: ghc-armv7-VFPv3D16--NEON.patch
@@ -416,6 +417,7 @@ Installing this package causes %{name}-*-prof packages corresponding
to
%if 0%{?fedora} >= 37
%patch7 -p1 -b .orig
%endif
+%patch8 -p1 -b .orig
rm libffi-tarballs/libffi-*.tar.gz
@@ -963,6 +965,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog
+* Tue Nov 22 2022 Florian Weimer <fweimer(a)redhat.com> - 9.4.3-14
+- Avoid implicit declaration of exit in configure check
+
* Fri Nov 4 2022 Jens Petersen <petersen(a)redhat.com> - 9.4.3-12
-
https://www.haskell.org/ghc/blog/20221103-ghc-9.4.3-released.html
-
https://downloads.haskell.org/~ghc/9.4.3/docs/users_guide/9.4.3-notes.html
commit 6aceec936fd07da0b7e9806dc7a8fc7590ece182
Author: Jens Petersen <petersen(a)redhat.com>
Date: Wed Nov 9 09:09:46 2022 +0800
disable docs on epel9 s390x with make (related to #2141054)
because make and hadrian doc packages differ:
93949413 build (epel9, /rpms/ghc9.4.git:2ee096a): open
(
buildvm-x86-07.iad2.fedoraproject.org) -> FAILED: BuildError: The following noarch
package built differently on different architectures:
ghc9.4-base-doc-4.17.0.0-13.el9.noarch.rpm
rpmdiff output was:
removed /usr/share/doc/ghc9.4/html/libraries/base-4.17.0.0/haddock-prologue.txt
removed /usr/share/doc/ghc9.4/html/libraries/ghc-bignum-1.3/haddock-prologue.txt
removed /usr/share/doc/ghc9.4/html/libraries/ghc-prim-0.9.0/haddock-prologue.txt
removed /usr/share/doc/ghc9.4/html/libraries/integer-gmp-1.1/haddock-prologue.txt
diff --git a/ghc9.4.spec b/ghc9.4.spec
index 6c9b5ff..76c024b 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -9,6 +9,8 @@
%if %{defined fedora}
%bcond_without hadrian
%else
+#
https://bugzilla.redhat.com/show_bug.cgi?id=2141054
+#
https://gitlab.haskell.org/ghc/ghc/-/issues/22427
%ifarch s390x
%bcond_with hadrian
%else
@@ -54,10 +56,20 @@
%ifarch armv7hl
%undefine with_haddock
%else
-%bcond_without haddock
-%endif
%if %{with hadrian}
+%bcond_without haddock
%bcond_without manual
+%else
+%ifarch s390x
+%if %{defined fedora}
+%bcond_without haddock
+%else
+%undefine with_haddock
+%endif
+%else
+%bcond_without haddock
+%endif
+%endif
%endif
%bcond_without perf_build
%endif
commit 744fe3703336964c2fea9e4d2a9cefbf8a8badb5
Author: Jens Petersen <petersen(a)redhat.com>
Date: Wed Nov 9 09:09:15 2022 +0800
update some old trac links to gitlab
diff --git a/ghc9.4.spec b/ghc9.4.spec
index 00c3e09..6c9b5ff 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -65,7 +65,7 @@
%if %{without hadrian}
# locked together since disabling haddock causes no manuals built
# and disabling haddock still created index.html
-#
https://ghc.haskell.org/trac/ghc/ticket/15190
+#
https://gitlab.haskell.org/ghc/ghc/-/issues/15190
%{?with_haddock:%bcond_without manual}
%endif
@@ -120,7 +120,7 @@ Patch12: ghc-armv7-VFPv3D16--NEON.patch
Patch13: text2-allow-ghc8-arm.patch
# for unregisterized
-#
https://ghc.haskell.org/trac/ghc/ticket/15689
+#
https://gitlab.haskell.org/ghc/ghc/-/issues/15689
Patch15: ghc-warnings.mk-CC-Wall.patch
Patch16: ghc-hadrian-s390x-rts--qg.patch
@@ -433,7 +433,7 @@ fi
%endif
%if %{without hadrian}
-#
http://ghc.haskell.org/trac/ghc/wiki/Platforms
+#
https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
cat > mk/build.mk << EOF
%if %{with perf_build}
%ifarch %{ghc_llvm_archs}
commit 2ee096ad6bca57770c60681e0bcf4d00f076ead7
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Nov 8 23:54:40 2022 +0800
fixup! epel9: disable hadrian for s390x (#2141054)
diff --git a/ghc9.4.spec b/ghc9.4.spec
index 2469a46..00c3e09 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -14,6 +14,7 @@
%else
%bcond_without hadrian
%endif
+%endif
# bcond_without for production builds: build hadrian
%bcond_without build_hadrian
commit 06310c29194f8c5a801dff47955010246a36b661
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Nov 8 22:57:25 2022 +0800
epel9: disable hadrian for s390x (#2141054)
failing in Hadrian stage1 like this:
===> Command failed with error code: 1
/tmp/ghc48723_0/ghc_7.s: Assembler messages:
/tmp/ghc48723_0/ghc_7.s:219:0: error:
Fatal error: unrecognized .section attribute: want a,e,o,w,x,M,S,G,T or number
|
219 | .section .data.stg_stop_thread_info,"awR",@progbits
| ^
`gcc' failed in phase `Assembler'. (Exit code: 1)
diff --git a/ghc9.4.spec b/ghc9.4.spec
index 94890da..2469a46 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -6,7 +6,14 @@
%bcond_with abicheck
# bcond_without for production builds: use Hadrian buildsystem
+%if %{defined fedora}
%bcond_without hadrian
+%else
+%ifarch s390x
+%bcond_with hadrian
+%else
+%bcond_without hadrian
+%endif
# bcond_without for production builds: build hadrian
%bcond_without build_hadrian
commit 42dd9b3105149b0e22f47784755a29d33a0263d7
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Nov 8 16:57:07 2022 +0800
reword the bcond comment explanations
diff --git a/ghc9.4.spec b/ghc9.4.spec
index a5ef871..94890da 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -1,17 +1,17 @@
# disable prof, docs, perf build
-# NB This must be disabled (bcond_with) for all koji production builds
+# bcond_with for production builds: disable quick build
%bcond_with quickbuild
# make sure ghc libraries' ABI hashes unchanged (ghcX.Y not supported yet)
%bcond_with abicheck
-# use the Hadrian buildsystem
+# bcond_without for production builds: use Hadrian buildsystem
%bcond_without hadrian
-# NB production builds should build hadrian (bcond_without)
+# bcond_without for production builds: build hadrian
%bcond_without build_hadrian
-# NB This should be enabled (bcond_without) for all production builds
+# bcond_without for production builds: enable debuginfo
%bcond_without ghc_debuginfo
%if %{without ghc_debuginfo}
commit a87f5317ea77cda6407c923c3a52fb177c2caaf1
Author: Jens Petersen <petersen(a)redhat.com>
Date: Tue Nov 8 16:56:43 2022 +0800
tweak changelog wording for ld.so.conf.d
diff --git a/ghc9.4.spec b/ghc9.4.spec
index 2148c29..a5ef871 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -949,7 +949,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
- enable Hadrian for epel9
* Mon Oct 31 2022 Jens Petersen <petersen(a)redhat.com> - 9.4.2-11
-- add ld.conf.d file for finding shared libraries under Hadrian
+- add ld.so.conf.d file for finding shared libraries under Hadrian
and remove RPATHs for Hadrian builds to rid rpmlint RUNPATH errors
- export LD to prevent configuring lld (see #2116508)
commit c53c892d7d382d7a2614b67cf4f758b8b6ae4376
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Nov 7 22:33:31 2022 +0800
bump llvm to 13 (for s390x)
diff --git a/ghc9.4.spec b/ghc9.4.spec
index c96894d..2148c29 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -65,7 +65,7 @@
%bcond_with testsuite
# 9.4 needs llvm 10-13
-%global llvm_major 12
+%global llvm_major 13
%if %{with hadrian}
%global ghc_llvm_archs armv7hl s390x
%global ghc_unregisterized_arches s390 %{mips} riscv64
@@ -80,7 +80,7 @@ Version: 9.4.3
# - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport
@@ -159,11 +159,7 @@ BuildRequires: python3
BuildRequires: python3-sphinx
%endif
%ifarch %{ghc_llvm_archs}
-%if 0%{?fedora} >= 34
BuildRequires: llvm%{llvm_major}
-%else
-BuildRequires: llvm >= %{llvm_major}
-%endif
%endif
BuildRequires: autoconf, automake
%if %{with hadrian}
@@ -242,11 +238,7 @@ Obsoletes: %{name}-doc-index < %{version}-%{release}
Obsoletes: %{name}-filesystem < %{version}-%{release}
%endif
%ifarch %{ghc_llvm_archs}
-%if 0%{?fedora} >= 34
Requires: llvm%{llvm_major}
-%else
-Requires: llvm >= %{llvm_major}
-%endif
%endif
%description compiler