From 2ad702097a1e0bc8e1e9b83b5bcc3364af533930 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 10 Jul 2023 20:37:10 +0100 Subject: [PATCH] OCaml 5.0 only has aarch64 & x86_64 native compilers OCaml 5.1 will add back ppc64le riscv64 s390x. It is unlikely that %{arm}, %{ix86} will ever return in future. We will ExcludeArch %{ix86} for OCaml. https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/ The others like ppc and sparc are obsolete. --- macros.ocaml-srpm | 4 ++-- ocaml-srpm-macros.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/macros.ocaml-srpm b/macros.ocaml-srpm index 3f5fda1..147b4ed 100644 --- a/macros.ocaml-srpm +++ b/macros.ocaml-srpm @@ -4,10 +4,10 @@ # compilation is available on a particular architecture. # Architectures that support the OCaml native code compiler. -%ocaml_native_compiler aarch64 %{arm} %{ix86} ppc ppc64 ppc64le riscv64 s390x sparc sparcv9 x86_64 +%ocaml_native_compiler aarch64 x86_64 # Architectures that support native dynamic linking of OCaml code. -%ocaml_natdynlink aarch64 %{arm} %{ix86} ppc ppc64 ppc64le riscv64 s390x sparc sparcv9 x86_64 +%ocaml_natdynlink aarch64 x86_64 # Architectures that support profiling of native code (ocamlopt -p). # This was removed in OCaml 4.09. diff --git a/ocaml-srpm-macros.spec b/ocaml-srpm-macros.spec index 6c4fca0..e2e8a6f 100644 --- a/ocaml-srpm-macros.spec +++ b/ocaml-srpm-macros.spec @@ -10,8 +10,8 @@ # See also: https://bugzilla.redhat.com/show_bug.cgi?id=1087794 Name: ocaml-srpm-macros -Version: 7 -Release: 3%{?dist} +Version: 8 +Release: 1%{?dist} Summary: OCaml architecture macros License: GPLv2+ @@ -48,6 +48,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat %changelog +* Mon Jul 10 2023 Richard W.M. Jones - 8-1 +- Update OCaml native archs for OCaml 5.0 + * Thu Jan 19 2023 Fedora Release Engineering - 7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild