From d8feb0688f7901578ebc609e6fdb427b51187e198433530dce0e527823baa2ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 13:42:05 +0000 Subject: [PATCH 1/6] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bootstrap revision:1, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=87 --- _constraints | 2 +- ghc-8.10.1-aarch64-unknown-linux.tar.xz | 3 -- ghc-8.10.1-arm-unknown-linux.tar.xz | 3 -- ghc-8.10.1-powerpc64-unknown-linux.tar.xz | 3 -- ghc-8.10.1-powerpc64le-unknown-linux.tar.xz | 3 -- ghc-8.10.1-riscv64-unknown-linux.tar.xz | 3 -- ghc-8.10.1-x86_64-unknown-linux.tar.xz | 3 -- ghc-8.10.2-s390x-ibm-linux.tar.xz | 3 -- ghc-8.10.4-riscv64-unknown-linux.tar.xz | 3 ++ 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-bootstrap.changes | 20 ------------ ghc-bootstrap.spec | 36 ++++++++------------- 16 files changed, 32 insertions(+), 65 deletions(-) delete mode 100644 ghc-8.10.1-aarch64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-arm-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-powerpc64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-powerpc64le-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-riscv64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-x86_64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.2-s390x-ibm-linux.tar.xz create mode 100644 ghc-8.10.4-riscv64-unknown-linux.tar.xz create mode 100644 ghc-8.10.7-aarch64-unknown-linux.tar.xz create mode 100644 ghc-8.10.7-powerpc64-unknown-linux.tar.xz create mode 100644 ghc-8.10.7-powerpc64le-unknown-linux.tar.xz create mode 100644 ghc-8.10.7-s390x-ibm-linux.tar.xz create mode 100644 ghc-8.10.7-x86_64-unknown-linux.tar.xz 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..c9ae9ca --- /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:ee52d9b187409e440e274b6d9a3d75fa9d5b6d2f7558b130839b45d4521e95a6 +size 124917248 diff --git a/ghc-8.10.7-aarch64-unknown-linux.tar.xz b/ghc-8.10.7-aarch64-unknown-linux.tar.xz new file mode 100644 index 0000000..4cd51f4 --- /dev/null +++ b/ghc-8.10.7-aarch64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..e47049a --- /dev/null +++ b/ghc-8.10.7-powerpc64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..1d03193 --- /dev/null +++ b/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..63c08a7 --- /dev/null +++ b/ghc-8.10.7-s390x-ibm-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..ec220f6 --- /dev/null +++ b/ghc-8.10.7-x86_64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14440f305e68dce895c8821f5086af2005e6f85e5bd69d7974f39bc7dc2101ca +size 81963328 diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes index 7ca732a..51095a4 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 19 12:39:27 UTC 2023 - Guillaume GARDET - -- Do not require unversionned llvm since ghc needs a specific - llvm version. [boo#1207265] - -------------------------------------------------------------------- -Thu Dec 1 16:43:06 UTC 2022 - Peter Simons - -- Explictly depend on libffi8 to make sure we're getting the - correct version of the libffi shared library. [jsc#PED-1151] - -------------------------------------------------------------------- -Fri Jun 24 07:13:19 UTC 2022 - Guillaume GARDET - -- Remove dependency on binutils-gold which have been removed from - Factory -- Allow a newer llvm to be used since llvm9 has been removed from - Factory - ------------------------------------------------------------------- Fri Feb 11 08:40:15 UTC 2022 - Peter Simons diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index f51d6c5..a0f6161 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) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,12 +15,6 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# Keep in sync with ghc.spec -%if 0%{suse_version} > 1550 -%global llvm_major 12 -%else -%global llvm_major 9 -%endif %ifarch ppc %define longarch powerpc @@ -67,39 +61,36 @@ 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-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 +Source19: ghc-8.10.4-riscv64-unknown-linux.tar.xz BuildRequires: fdupes BuildRequires: gmp-devel BuildRequires: libncurses5 BuildRequires: pkgconfig(libffi) -BuildRequires: libffi8 >= 3.4.4 Requires: gmp-devel Requires: libncurses5 Requires: pkgconfig(libffi) -Requires: libffi8 >= 3.4.4 # This package is not meant to be used outside OBS Requires: this-is-only-for-build-envs 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: 8.10.7 Release: 0 %endif %ifnarch %{arm} s390x BuildRequires: libnuma-devel %endif -%ifarch aarch64 %{arm} -Requires: llvm%{llvm_major} +%ifarch aarch64 riscv64 +Requires: llvm12 %endif %ifnarch %{arm} s390x Requires: libffi-devel @@ -121,7 +112,6 @@ cp %{SOURCE13} . cp %{SOURCE14} . cp %{SOURCE16} . cp %{SOURCE17} . -cp %{SOURCE18} . cp %{SOURCE19} . %build From c4bf9572b78e7543c7158abb778f22fab16b77eddc6ae3430ac090a9d20ad3ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 14:52:33 +0000 Subject: [PATCH 2/6] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bootstrap revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=88 --- ghc-bootstrap.changes | 25 +++++++++++++++++++++++++ ghc-bootstrap.spec | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes index 51095a4..b04fa79 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +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 + +- Do not require unversionned llvm since ghc needs a specific + llvm version. [boo#1207265] + +------------------------------------------------------------------- +Thu Dec 1 16:43:06 UTC 2022 - Peter Simons + +- Explictly depend on libffi8 to make sure we're getting the + correct version of the libffi shared library. [jsc#PED-1151] + +------------------------------------------------------------------- +Fri Jun 24 07:13:19 UTC 2022 - Guillaume GARDET + +- Remove dependency on binutils-gold which have been removed from + Factory +- Allow a newer llvm to be used since llvm9 has been removed from + Factory + ------------------------------------------------------------------- Fri Feb 11 08:40:15 UTC 2022 - Peter Simons diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index a0f6161..df3ebdc 100644 --- a/ghc-bootstrap.spec +++ b/ghc-bootstrap.spec @@ -15,6 +15,12 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# Keep in sync with ghc.spec +%if 0%{suse_version} > 1550 +%global llvm_major 12 +%else +%global llvm_major 9 +%endif %ifarch ppc %define longarch powerpc @@ -71,9 +77,11 @@ BuildRequires: fdupes BuildRequires: gmp-devel BuildRequires: libncurses5 BuildRequires: pkgconfig(libffi) +BuildRequires: libffi8 >= 3.4.4 Requires: gmp-devel Requires: libncurses5 Requires: pkgconfig(libffi) +Requires: libffi8 >= 3.4.4 # This package is not meant to be used outside OBS Requires: this-is-only-for-build-envs Provides: ghc-bootstrap-devel @@ -90,7 +98,7 @@ Release: 0 BuildRequires: libnuma-devel %endif %ifarch aarch64 riscv64 -Requires: llvm12 +Requires: llvm%{llvm_major} %endif %ifnarch %{arm} s390x Requires: libffi-devel From 10c68229f12de52e63809cf50e6f915b792a5b507e2e81421f51eebdf7a817fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Feb 2023 09:19:02 +0000 Subject: [PATCH 3/6] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-bootstrap revision:23, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=89 --- _constraints | 2 +- ghc-8.10.1-aarch64-unknown-linux.tar.xz | 3 +++ ghc-8.10.1-arm-unknown-linux.tar.xz | 3 +++ ghc-8.10.1-powerpc64-unknown-linux.tar.xz | 3 +++ ghc-8.10.1-powerpc64le-unknown-linux.tar.xz | 3 +++ ghc-8.10.1-riscv64-unknown-linux.tar.xz | 3 +++ ghc-8.10.1-x86_64-unknown-linux.tar.xz | 3 +++ ghc-8.10.2-s390x-ibm-linux.tar.xz | 3 +++ ghc-8.10.4-riscv64-unknown-linux.tar.xz | 3 --- 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-bootstrap.changes | 5 ---- ghc-bootstrap.spec | 26 +++++++++++---------- 16 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 ghc-8.10.1-aarch64-unknown-linux.tar.xz create mode 100644 ghc-8.10.1-arm-unknown-linux.tar.xz create mode 100644 ghc-8.10.1-powerpc64-unknown-linux.tar.xz create mode 100644 ghc-8.10.1-powerpc64le-unknown-linux.tar.xz create mode 100644 ghc-8.10.1-riscv64-unknown-linux.tar.xz create mode 100644 ghc-8.10.1-x86_64-unknown-linux.tar.xz create mode 100644 ghc-8.10.2-s390x-ibm-linux.tar.xz delete mode 100644 ghc-8.10.4-riscv64-unknown-linux.tar.xz 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 diff --git a/_constraints b/_constraints index 4de687b..70acc38 100644 --- a/_constraints +++ b/_constraints @@ -10,7 +10,7 @@ - 16 + 8 diff --git a/ghc-8.10.1-aarch64-unknown-linux.tar.xz b/ghc-8.10.1-aarch64-unknown-linux.tar.xz new file mode 100644 index 0000000..57cc1d4 --- /dev/null +++ b/ghc-8.10.1-aarch64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..89e0ae4 --- /dev/null +++ b/ghc-8.10.1-arm-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..3ad4288 --- /dev/null +++ b/ghc-8.10.1-powerpc64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..22608b5 --- /dev/null +++ b/ghc-8.10.1-powerpc64le-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..fbd6e70 --- /dev/null +++ b/ghc-8.10.1-riscv64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..0808e51 --- /dev/null +++ b/ghc-8.10.1-x86_64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..6eb59a8 --- /dev/null +++ b/ghc-8.10.2-s390x-ibm-linux.tar.xz @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index c9ae9ca..0000000 --- a/ghc-8.10.4-riscv64-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee52d9b187409e440e274b6d9a3d75fa9d5b6d2f7558b130839b45d4521e95a6 -size 124917248 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-bootstrap.changes b/ghc-bootstrap.changes index b04fa79..7ca732a 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 df3ebdc..f51d6c5 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) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -67,12 +67,13 @@ 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 -Source19: ghc-8.10.4-riscv64-unknown-linux.tar.xz +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 BuildRequires: fdupes BuildRequires: gmp-devel BuildRequires: libncurses5 @@ -85,19 +86,19 @@ Requires: libffi8 >= 3.4.4 # This package is not meant to be used outside OBS Requires: this-is-only-for-build-envs Provides: ghc-bootstrap-devel -ExclusiveArch: ppc64 ppc64le x86_64 s390x aarch64 riscv64 +ExclusiveArch: ppc64 ppc64le x86_64 s390x aarch64 %{arm} riscv64 AutoReq: off -%ifarch riscv64 -Version: 8.10.4 +%ifnarch s390 s390x +Version: 8.10.1 Release: 0 %else -Version: 8.10.7 +Version: 8.10.2 Release: 0 %endif %ifnarch %{arm} s390x BuildRequires: libnuma-devel %endif -%ifarch aarch64 riscv64 +%ifarch aarch64 %{arm} Requires: llvm%{llvm_major} %endif %ifnarch %{arm} s390x @@ -120,6 +121,7 @@ cp %{SOURCE13} . cp %{SOURCE14} . cp %{SOURCE16} . cp %{SOURCE17} . +cp %{SOURCE18} . cp %{SOURCE19} . %build From 29eb194527ba1bc916b7ad9c15528b40833de63272c8f00084a113289051fc90 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:20 +0000 Subject: [PATCH 4/6] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bootstrap revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=90 --- _constraints | 2 +- ghc-8.10.1-aarch64-unknown-linux.tar.xz | 3 - ghc-8.10.1-arm-unknown-linux.tar.xz | 3 - ghc-8.10.1-powerpc64-unknown-linux.tar.xz | 3 - ghc-8.10.1-powerpc64le-unknown-linux.tar.xz | 3 - ghc-8.10.1-riscv64-unknown-linux.tar.xz | 3 - ghc-8.10.1-x86_64-unknown-linux.tar.xz | 3 - ghc-8.10.2-s390x-ibm-linux.tar.xz | 3 - ghc-8.10.4-riscv64-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 | 102 ++++++++++++-------- 16 files changed, 84 insertions(+), 64 deletions(-) delete mode 100644 ghc-8.10.1-aarch64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-arm-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-powerpc64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-powerpc64le-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-riscv64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.1-x86_64-unknown-linux.tar.xz delete mode 100644 ghc-8.10.2-s390x-ibm-linux.tar.xz create mode 100644 ghc-8.10.4-riscv64-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/_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..b04fa79 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..b3a3fa1 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,42 @@ 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 # 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 +112,53 @@ 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 +%ghost %{_datadir} +%ghost %{_datadir}/doc +%ghost %{_docdir} %doc README.openSUSE %license LICENSE /opt/* +%{_sysconfdir}/ld.so.conf.d/ghc.conf %changelog From 8da2f7d1b75568719f2526edfed316f25e338c3a510bfdef10656bfdea3cdc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 3 Apr 2023 09:15:54 +0000 Subject: [PATCH 5/6] osc copypac from project:home:mimi_vx:ghc-bootstrap package:ghc-bootstrap revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=91 --- 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.spec | 90 ++++++++------------- 12 files changed, 52 insertions(+), 72 deletions(-) create mode 100644 ghc-8.10.7-aarch64-unknown-linux.tar.xz create mode 100644 ghc-8.10.7-powerpc64-unknown-linux.tar.xz create mode 100644 ghc-8.10.7-powerpc64le-unknown-linux.tar.xz create mode 100644 ghc-8.10.7-s390x-ibm-linux.tar.xz create mode 100644 ghc-8.10.7-x86_64-unknown-linux.tar.xz delete mode 100644 ghc-9.2.3-aarch64-unknown-linux.tar.xz delete mode 100644 ghc-9.2.3-powerpc64-unknown-linux.tar.xz delete mode 100644 ghc-9.2.3-powerpc64le-unknown-linux.tar.xz delete mode 100644 ghc-9.2.3-s390x-ibm-linux.tar.xz delete 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 e345dc0..c9ae9ca 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:7ae0f7001f84c21cf9f2a421e8cc7211a2ac8f557f24b2f1047c95525731a2cc -size 134574884 +oid sha256:ee52d9b187409e440e274b6d9a3d75fa9d5b6d2f7558b130839b45d4521e95a6 +size 124917248 diff --git a/ghc-8.10.7-aarch64-unknown-linux.tar.xz b/ghc-8.10.7-aarch64-unknown-linux.tar.xz new file mode 100644 index 0000000..4cd51f4 --- /dev/null +++ b/ghc-8.10.7-aarch64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..e47049a --- /dev/null +++ b/ghc-8.10.7-powerpc64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..1d03193 --- /dev/null +++ b/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..63c08a7 --- /dev/null +++ b/ghc-8.10.7-s390x-ibm-linux.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..ec220f6 --- /dev/null +++ b/ghc-8.10.7-x86_64-unknown-linux.tar.xz @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index 9244d98..0000000 --- a/ghc-9.2.3-aarch64-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 89a36e9..0000000 --- a/ghc-9.2.3-powerpc64-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index df9561c..0000000 --- a/ghc-9.2.3-powerpc64le-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 1488e57..0000000 --- a/ghc-9.2.3-s390x-ibm-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 06e7b38..0000000 --- a/ghc-9.2.3-x86_64-unknown-linux.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aface19c988ba5ce9874b2280e53356a61626d92ebbee9f03544d2e2bb6706a8 -size 79167936 diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index b3a3fa1..df3ebdc 100644 --- a/ghc-bootstrap.spec +++ b/ghc-bootstrap.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-bootstrap # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,38 +15,48 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - -%if 0%{?suse_version} > 1550 +# Keep in sync with ghc.spec +%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 -# something weird on ghc arch detection -%define arch ppc64 +%endif +%ifarch s390 +%define longarch s390 %endif %ifarch s390x %define longarch s390x -%define sysname ibm -%define arch s390x %endif %ifarch aarch64 %define longarch aarch64 -%define arch aarch64 +%endif +%ifarch %{arm} +%define longarch arm %endif %ifarch x86_64 %define longarch x86_64 -%define sysname unknown -%define arch x86_64 %endif %ifarch riscv64 %define longarch riscv64 -%define arch riscv64 +%endif +%ifarch s390 s390x +%define sysname ibm +%endif +%ifarch x86_64 +%define sysname unknown +%endif +%ifarch %{ix86} +%define sysname unknown %endif %ifarch ppc64 ppc64le %{arm} aarch64 riscv64 %define sysname unknown @@ -57,25 +67,23 @@ License: BSD-3-Clause URL: https://build.opensuse.org/package/view_file/devel:languages:haskell:bootstrap Source1: README.openSUSE Source2: LICENSE -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 +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 Source19: ghc-8.10.4-riscv64-unknown-linux.tar.xz -BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gmp-devel -BuildRequires: libffi8 >= 3.4.4 BuildRequires: libncurses5 -BuildRequires: pkgconfig BuildRequires: pkgconfig(libffi) +BuildRequires: libffi8 >= 3.4.4 Requires: gmp-devel -Requires: libffi8 >= 3.4.4 Requires: libncurses5 +Requires: pkgconfig(libffi) +Requires: libffi8 >= 3.4.4 # 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 @@ -83,16 +91,16 @@ AutoReq: off Version: 8.10.4 Release: 0 %else -Version: 9.2.3 +Version: 8.10.7 Release: 0 %endif -%ifnarch s390x +%ifnarch %{arm} s390x BuildRequires: libnuma-devel %endif -%ifarch s390x riscv64 +%ifarch aarch64 riscv64 Requires: llvm%{llvm_major} %endif -%ifnarch s390x +%ifnarch %{arm} s390x Requires: libffi-devel Requires: libnuma-devel %endif @@ -116,49 +124,21 @@ 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 -%ghost %{_datadir} -%ghost %{_datadir}/doc -%ghost %{_docdir} %doc README.openSUSE %license LICENSE /opt/* -%{_sysconfdir}/ld.so.conf.d/ghc.conf %changelog 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 6/6] 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