diff --git a/_constraints b/_constraints
index 70acc38..4de687b 100644
--- a/_constraints
+++ b/_constraints
@@ -10,7 +10,7 @@
- 8
+ 16
diff --git a/ghc-8.10.1-aarch64-unknown-linux.tar.xz b/ghc-8.10.1-aarch64-unknown-linux.tar.xz
deleted file mode 100644
index 57cc1d4..0000000
--- a/ghc-8.10.1-aarch64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:138a81ec916912668d24f8c444a21327d17a4469487d80f7a85878dadce7a0c8
-size 129565124
diff --git a/ghc-8.10.1-arm-unknown-linux.tar.xz b/ghc-8.10.1-arm-unknown-linux.tar.xz
deleted file mode 100644
index 89e0ae4..0000000
--- a/ghc-8.10.1-arm-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4f0ca1fa23563c16cbcf2a244c8e0e146cd712af49264af383e7adc2bef4168
-size 142578288
diff --git a/ghc-8.10.1-powerpc64-unknown-linux.tar.xz b/ghc-8.10.1-powerpc64-unknown-linux.tar.xz
deleted file mode 100644
index 3ad4288..0000000
--- a/ghc-8.10.1-powerpc64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7b1e51fd02fec4ca8f657dda97476247292d7450d19505216b5bcf1c3470a8c
-size 120594748
diff --git a/ghc-8.10.1-powerpc64le-unknown-linux.tar.xz b/ghc-8.10.1-powerpc64le-unknown-linux.tar.xz
deleted file mode 100644
index 22608b5..0000000
--- a/ghc-8.10.1-powerpc64le-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff7c4c5011f6f7284a1bda4f51deb0b34afc9cd89cc001cf5935f4ba91af07cd
-size 123090680
diff --git a/ghc-8.10.1-riscv64-unknown-linux.tar.xz b/ghc-8.10.1-riscv64-unknown-linux.tar.xz
deleted file mode 100644
index fbd6e70..0000000
--- a/ghc-8.10.1-riscv64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85a2c84563a1e27567b56e54be10aa42570127b1a5fdf889a280a671b398ab59
-size 150069944
diff --git a/ghc-8.10.1-x86_64-unknown-linux.tar.xz b/ghc-8.10.1-x86_64-unknown-linux.tar.xz
deleted file mode 100644
index 0808e51..0000000
--- a/ghc-8.10.1-x86_64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1500173924bd2f463c77096712a516396aa9512b5f7511b2ccab71a39f8b645
-size 86007760
diff --git a/ghc-8.10.2-s390x-ibm-linux.tar.xz b/ghc-8.10.2-s390x-ibm-linux.tar.xz
deleted file mode 100644
index 6eb59a8..0000000
--- a/ghc-8.10.2-s390x-ibm-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3cd7aecc5a296045269f06ce49c858b0224fd3c7c5b862d6f3e74aad80d02e44
-size 132600848
diff --git a/ghc-8.10.4-riscv64-unknown-linux.tar.xz b/ghc-8.10.4-riscv64-unknown-linux.tar.xz
new file mode 100644
index 0000000..e345dc0
--- /dev/null
+++ b/ghc-8.10.4-riscv64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ae0f7001f84c21cf9f2a421e8cc7211a2ac8f557f24b2f1047c95525731a2cc
+size 134574884
diff --git a/ghc-9.2.3-aarch64-unknown-linux.tar.xz b/ghc-9.2.3-aarch64-unknown-linux.tar.xz
new file mode 100644
index 0000000..9244d98
--- /dev/null
+++ b/ghc-9.2.3-aarch64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc62b8504a5b2e61c9c68c720ea4c366cff79f4a208311d345ed6254e4881e9e
+size 82490872
diff --git a/ghc-9.2.3-powerpc64-unknown-linux.tar.xz b/ghc-9.2.3-powerpc64-unknown-linux.tar.xz
new file mode 100644
index 0000000..89a36e9
--- /dev/null
+++ b/ghc-9.2.3-powerpc64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9c16463f05e920f955c9494ab65fcb1baa8f786116ded0860fe4b8fd40cbf45
+size 93060456
diff --git a/ghc-9.2.3-powerpc64le-unknown-linux.tar.xz b/ghc-9.2.3-powerpc64le-unknown-linux.tar.xz
new file mode 100644
index 0000000..df9561c
--- /dev/null
+++ b/ghc-9.2.3-powerpc64le-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1715d70da13967fb2005df13ea87da951765387c74975bc1c3852847b7d0a67d
+size 96131204
diff --git a/ghc-9.2.3-s390x-ibm-linux.tar.xz b/ghc-9.2.3-s390x-ibm-linux.tar.xz
new file mode 100644
index 0000000..1488e57
--- /dev/null
+++ b/ghc-9.2.3-s390x-ibm-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb034100a057aa8cd756fd73319c9c4252e46b14415f2995372aa5f9c11c0108
+size 97046256
diff --git a/ghc-9.2.3-x86_64-unknown-linux.tar.xz b/ghc-9.2.3-x86_64-unknown-linux.tar.xz
new file mode 100644
index 0000000..06e7b38
--- /dev/null
+++ b/ghc-9.2.3-x86_64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aface19c988ba5ce9874b2280e53356a61626d92ebbee9f03544d2e2bb6706a8
+size 79167936
diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes
index 7ca732a..35bdd3d 100644
--- a/ghc-bootstrap.changes
+++ b/ghc-bootstrap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 3 09:13:52 UTC 2023 - Ondřej Súkup
+
+- update bootstrap compiler to 9.2.3 using hadrian build
+
+-------------------------------------------------------------------
+Thu Feb 2 14:27:08 UTC 2023 - Peter Simons
+
+- Update bootstrap compiler to ghc-8.10.7.
+
-------------------------------------------------------------------
Thu Jan 19 12:39:27 UTC 2023 - Guillaume GARDET
diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec
index f51d6c5..1dd5eb2 100644
--- a/ghc-bootstrap.spec
+++ b/ghc-bootstrap.spec
@@ -1,7 +1,7 @@
#
# spec file for package ghc-bootstrap
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,48 +15,38 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-# Keep in sync with ghc.spec
-%if 0%{suse_version} > 1550
+
+%if 0%{?suse_version} > 1550
%global llvm_major 12
%else
%global llvm_major 9
%endif
-
-%ifarch ppc
-%define longarch powerpc
-%endif
%ifarch ppc64
%define longarch powerpc64
+%define arch ppc64
%endif
%ifarch ppc64le
%define longarch powerpc64le
-%endif
-%ifarch s390
-%define longarch s390
+# something weird on ghc arch detection
+%define arch ppc64
%endif
%ifarch s390x
%define longarch s390x
+%define sysname ibm
+%define arch s390x
%endif
%ifarch aarch64
%define longarch aarch64
-%endif
-%ifarch %{arm}
-%define longarch arm
+%define arch aarch64
%endif
%ifarch x86_64
%define longarch x86_64
+%define sysname unknown
+%define arch x86_64
%endif
%ifarch riscv64
%define longarch riscv64
-%endif
-%ifarch s390 s390x
-%define sysname ibm
-%endif
-%ifarch x86_64
-%define sysname unknown
-%endif
-%ifarch %{ix86}
-%define sysname unknown
+%define arch riscv64
%endif
%ifarch ppc64 ppc64le %{arm} aarch64 riscv64
%define sysname unknown
@@ -67,41 +57,43 @@ License: BSD-3-Clause
URL: https://build.opensuse.org/package/view_file/devel:languages:haskell:bootstrap
Source1: README.openSUSE
Source2: LICENSE
-Source12: ghc-8.10.1-powerpc64-unknown-linux.tar.xz
-Source13: ghc-8.10.1-powerpc64le-unknown-linux.tar.xz
-Source14: ghc-8.10.1-x86_64-unknown-linux.tar.xz
-Source16: ghc-8.10.2-s390x-ibm-linux.tar.xz
-Source17: ghc-8.10.1-aarch64-unknown-linux.tar.xz
-Source18: ghc-8.10.1-arm-unknown-linux.tar.xz
-Source19: ghc-8.10.1-riscv64-unknown-linux.tar.xz
+Source12: ghc-9.2.3-powerpc64-unknown-linux.tar.xz
+Source13: ghc-9.2.3-powerpc64le-unknown-linux.tar.xz
+Source14: ghc-9.2.3-x86_64-unknown-linux.tar.xz
+Source16: ghc-9.2.3-s390x-ibm-linux.tar.xz
+Source17: ghc-9.2.3-aarch64-unknown-linux.tar.xz
+Source19: ghc-8.10.4-riscv64-unknown-linux.tar.xz
+BuildRequires: chrpath
BuildRequires: fdupes
BuildRequires: gmp-devel
-BuildRequires: libncurses5
-BuildRequires: pkgconfig(libffi)
BuildRequires: libffi8 >= 3.4.4
+BuildRequires: libncurses5
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(libffi)
Requires: gmp-devel
-Requires: libncurses5
-Requires: pkgconfig(libffi)
Requires: libffi8 >= 3.4.4
+Requires: libncurses5
+Conflicts: ghc-base
# This package is not meant to be used outside OBS
Requires: this-is-only-for-build-envs
+Requires: pkgconfig(libffi)
Provides: ghc-bootstrap-devel
-ExclusiveArch: ppc64 ppc64le x86_64 s390x aarch64 %{arm} riscv64
+ExclusiveArch: ppc64 ppc64le x86_64 s390x aarch64 riscv64
AutoReq: off
-%ifnarch s390 s390x
-Version: 8.10.1
+%ifarch riscv64
+Version: 8.10.4
Release: 0
%else
-Version: 8.10.2
+Version: 9.2.3
Release: 0
%endif
-%ifnarch %{arm} s390x
+%ifnarch s390x
BuildRequires: libnuma-devel
%endif
-%ifarch aarch64 %{arm}
+%ifarch s390x riscv64
Requires: llvm%{llvm_major}
%endif
-%ifnarch %{arm} s390x
+%ifnarch s390x
Requires: libffi-devel
Requires: libnuma-devel
%endif
@@ -121,26 +113,50 @@ cp %{SOURCE13} .
cp %{SOURCE14} .
cp %{SOURCE16} .
cp %{SOURCE17} .
-cp %{SOURCE18} .
cp %{SOURCE19} .
%build
tar Jxf ghc-%{version}-%{longarch}-%{sysname}-linux.tar.xz
+%ifarch riscv64
cd ghc-%{version}
+%else
+cd ghc-%{version}-%{longarch}-%{sysname}-linux
+%endif
# FIXME: you should use the %%configure macro
-./configure --prefix=/opt
%install
+%ifarch riscv64
cd ghc-%{version}
+%else
+cd ghc-%{version}-%{longarch}-%{sysname}-linux
+%endif
+
+./configure --prefix=/opt
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "/opt/lib/ghc-%{version}/lib/%{arch}-linux-ghc-%{version}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/ghc.conf
%make_install
%fdupes -s %{buildroot}
+for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do
+ chrpath -d $i
+done
+
+rm %{buildroot}/opt/lib/ghc-%{version}/lib/package.conf.d/.stamp
+(cd %{buildroot}/opt/lib/ghc-%{version}/lib/package.conf.d/
+for i in *.conf; do
+ mv $i.copy $i
+done
+)
%post
+/sbin/ldconfig
/opt/bin/ghc-pkg recache
+%postun -p /sbin/ldconfig
+
%files
%doc README.openSUSE
%license LICENSE
/opt/*
+%config %{_sysconfdir}/ld.so.conf.d/ghc.conf
%changelog