From 7f172f30b748b4f933b92cbdcd4a610e35cfbb3d8fbaf1f905ae74b1ee70d103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 3 Apr 2023 09:16:15 +0000 Subject: [PATCH] osc copypac from project:home:mimi_vx:ghc94x package:ghc-bootstrap revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=92 --- ghc-8.10.4-riscv64-unknown-linux.tar.xz | 4 +- ghc-8.10.7-aarch64-unknown-linux.tar.xz | 3 - ghc-8.10.7-powerpc64-unknown-linux.tar.xz | 3 - ghc-8.10.7-powerpc64le-unknown-linux.tar.xz | 3 - ghc-8.10.7-s390x-ibm-linux.tar.xz | 3 - ghc-8.10.7-x86_64-unknown-linux.tar.xz | 3 - ghc-9.2.3-aarch64-unknown-linux.tar.xz | 3 + ghc-9.2.3-powerpc64-unknown-linux.tar.xz | 3 + ghc-9.2.3-powerpc64le-unknown-linux.tar.xz | 3 + ghc-9.2.3-s390x-ibm-linux.tar.xz | 3 + ghc-9.2.3-x86_64-unknown-linux.tar.xz | 3 + ghc-bootstrap.changes | 5 ++ ghc-bootstrap.spec | 90 ++++++++++++--------- 13 files changed, 76 insertions(+), 53 deletions(-) delete mode 100644 ghc-8.10.7-aarch64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.7-powerpc64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.7-powerpc64le-unknown-linux.tar.xz delete mode 100644 ghc-8.10.7-s390x-ibm-linux.tar.xz delete mode 100644 ghc-8.10.7-x86_64-unknown-linux.tar.xz create mode 100644 ghc-9.2.3-aarch64-unknown-linux.tar.xz create mode 100644 ghc-9.2.3-powerpc64-unknown-linux.tar.xz create mode 100644 ghc-9.2.3-powerpc64le-unknown-linux.tar.xz create mode 100644 ghc-9.2.3-s390x-ibm-linux.tar.xz create mode 100644 ghc-9.2.3-x86_64-unknown-linux.tar.xz diff --git a/ghc-8.10.4-riscv64-unknown-linux.tar.xz b/ghc-8.10.4-riscv64-unknown-linux.tar.xz index c9ae9ca..e345dc0 100644 --- a/ghc-8.10.4-riscv64-unknown-linux.tar.xz +++ b/ghc-8.10.4-riscv64-unknown-linux.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee52d9b187409e440e274b6d9a3d75fa9d5b6d2f7558b130839b45d4521e95a6 -size 124917248 +oid sha256:7ae0f7001f84c21cf9f2a421e8cc7211a2ac8f557f24b2f1047c95525731a2cc +size 134574884 diff --git a/ghc-8.10.7-aarch64-unknown-linux.tar.xz b/ghc-8.10.7-aarch64-unknown-linux.tar.xz deleted file mode 100644 index 4cd51f4..0000000 --- a/ghc-8.10.7-aarch64-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e3815ac392c11722d8a64bf60e9796f708bee57309fea33f656cf160573cffc -size 128429764 diff --git a/ghc-8.10.7-powerpc64-unknown-linux.tar.xz b/ghc-8.10.7-powerpc64-unknown-linux.tar.xz deleted file mode 100644 index e47049a..0000000 --- a/ghc-8.10.7-powerpc64-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97f385c0ef142f353cac984ac3bfa8bdc4b52d3eb6a23ed3252b53acfd3eb82b -size 117645740 diff --git a/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz b/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz deleted file mode 100644 index 1d03193..0000000 --- a/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a7d9f9bd9a9475ee1e7ef3bf9a24a6f24abfe0a3576f2266df8f6d8dcc742c3 -size 119860212 diff --git a/ghc-8.10.7-s390x-ibm-linux.tar.xz b/ghc-8.10.7-s390x-ibm-linux.tar.xz deleted file mode 100644 index 63c08a7..0000000 --- a/ghc-8.10.7-s390x-ibm-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5712245bcf9d9887e9d052f463a844e71cb44f5093cab62cb04c2cf47735d5bf -size 136752520 diff --git a/ghc-8.10.7-x86_64-unknown-linux.tar.xz b/ghc-8.10.7-x86_64-unknown-linux.tar.xz deleted file mode 100644 index ec220f6..0000000 --- a/ghc-8.10.7-x86_64-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14440f305e68dce895c8821f5086af2005e6f85e5bd69d7974f39bc7dc2101ca -size 81963328 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 b04fa79..35bdd3d 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index df3ebdc..1dd5eb2 100644 --- a/ghc-bootstrap.spec +++ b/ghc-bootstrap.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-bootstrap # -# Copyright (c) 2022 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,23 +57,26 @@ 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.7-powerpc64-unknown-linux.tar.xz -Source13: ghc-8.10.7-powerpc64le-unknown-linux.tar.xz -Source14: ghc-8.10.7-x86_64-unknown-linux.tar.xz -Source16: ghc-8.10.7-s390x-ibm-linux.tar.xz -Source17: ghc-8.10.7-aarch64-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 riscv64 AutoReq: off @@ -91,16 +84,16 @@ AutoReq: off Version: 8.10.4 Release: 0 %else -Version: 8.10.7 +Version: 9.2.3 Release: 0 %endif -%ifnarch %{arm} s390x +%ifnarch s390x BuildRequires: libnuma-devel %endif -%ifarch aarch64 riscv64 +%ifarch s390x riscv64 Requires: llvm%{llvm_major} %endif -%ifnarch %{arm} s390x +%ifnarch s390x Requires: libffi-devel Requires: libnuma-devel %endif @@ -124,21 +117,46 @@ 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