0001-Don-t-add-rpaths-to-libraries.patch

@@ -1,4 +1,4 @@
-From 04e523e937625bf30d775681c11e00f6dc6fc00a Mon Sep 17 00:00:00 2001
+From c8e378e67fc8fbd9ef177794d4ed831d5528bd0b Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 24 Jun 2014 10:00:15 +0100
 Subject: [PATCH 1/2] Don't add rpaths to libraries.
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Don't add rpaths to libraries.
  1 file changed, 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 3754ad8a39..fb60c7c14c 100644
+index 0535f404b0..085fba6626 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1422,8 +1422,6 @@ AS_IF([test x"$enable_shared" != "xno"],
@@ -21,5 +21,5 @@ index 3754ad8a39..fb60c7c14c 100644
        supports_shared_libraries=true],
        [mkdll='shared-libs-not-available'])
 -- 
-2.52.0
+2.50.1
 

0002-configure-Allow-user-defined-C-compiler-flags.patch

@@ -1,4 +1,4 @@
-From ef549c9a97838331877b139f407269db2a0fc691 Mon Sep 17 00:00:00 2001
+From 8323a13546c138266c609be8aa12841982d3a125 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 May 2012 20:44:18 +0100
 Subject: [PATCH 2/2] configure: Allow user defined C compiler flags.
@@ -8,10 +8,21 @@ Subject: [PATCH 2/2] configure: Allow user defined C compiler flags.
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index fb60c7c14c..f6a493ccf5 100644
+index 085fba6626..353e10c4fc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3243,7 +3243,7 @@ AC_CONFIG_COMMANDS_PRE([
+@@ -997,6 +997,10 @@ AS_CASE([$ocaml_cc_vendor],
+     internal_cflags="$cc_warnings"],
+   [common_cflags="-O"])
+ 
++# Allow CFLAGS and LDFLAGS to be added.
++common_cflags="$common_cflags $CFLAGS"
++cclibs="$cclibs $LDFLAGS"
++
+ # Enable SSE2 on x86 mingw to avoid using 80-bit registers.
+ AS_CASE([$target],
+   [i686-w64-mingw32*],
+@@ -2847,7 +2851,7 @@ AC_CONFIG_COMMANDS_PRE([
        [mkexedebugflag="${mkexe_ldflags_prefix}${mkexedebugflag}"])
      mkdll_ldflags=""
      AS_IF([test -n "${LDFLAGS}"],
@@ -21,5 +32,5 @@ index fb60c7c14c..f6a493ccf5 100644
        done
        mkdll_ldflags_exp="$mkdll_ldflags"])
 -- 
-2.52.0
+2.50.1
 

ocaml.spec

@@ -1,6 +1,13 @@
 # Don't add -Wl,-dT,<build dir>
 %undefine _package_note_flags
 
+# OCaml 5.1 broke building with LTO.  A file prims.c is generated with
+# primitive function declarations, all with "void" for their parameter
+# list.  This does not match the real definitions, leading to lots of
+# -Wlto-type-mismatch warnings.  These change the output of the tests,
+# leading to many failed tests.  This is still a problem in 5.3.
+%global _lto_cflags %{nil}
+
 # OCaml has a bytecode backend that works on anything with a C
 # compiler, and a native code backend available on a subset of
 # architectures.  A further subset of architectures support native
@@ -25,7 +32,7 @@ ExcludeArch: %{ix86}
 
 # These are all the architectures that the tests run on.  The tests
 # take a long time to run, so don't run them on slow machines.
-%global test_arches %{arm64} %{power64} %{riscv64} s390x %{x86_64}
+%global test_arches aarch64 %{power64} riscv64 s390x x86_64
 # These are the architectures for which the tests must pass otherwise
 # the build will fail.
 #global test_arches_required aarch64 ppc64le x86_64
@@ -38,7 +45,7 @@ ExcludeArch: %{ix86}
 %global rcver %{nil}
 
 Name:           ocaml
-Version:        5.5.0
+Version:        5.4.0
 Release:        2%{?dist}
 
 Summary:        OCaml compiler and programming environment
@@ -61,7 +68,7 @@ Source2:        ocaml_files.py
 #
 # https://pagure.io/fedora-ocaml
 #
-# Current branch: fedora-45-5.4.1
+# Current branch: fedora-44-5.4.0
 #
 # ALTERNATIVELY add a patch to the end of the list (leaving the
 # existing patches unchanged) adding a comment to note that it should
@@ -76,12 +83,15 @@ BuildRequires:  git-core
 BuildRequires:  gcc
 BuildRequires:  autoconf
 BuildRequires:  gawk
+BuildRequires:  hardlink
 BuildRequires:  perl-interpreter
-BuildRequires:  annobin-annocheck
+BuildRequires:  util-linux
+BuildRequires:  /usr/bin/annocheck
 BuildRequires:  pkgconfig(libzstd)
 
 # Documentation requirements
 BuildRequires:  asciidoc
+BuildRequires:  python3-pygments
 
 # ocamlopt runs gcc to link binaries.  Because Fedora includes
 # hardening flags automatically, redhat-rpm-config is also required.
@@ -101,6 +111,9 @@ Requires:       ocaml-runtime%{?_isa} = %{version}-%{release}
 BuildRequires:  ocaml-srpm-macros >= 10
 Requires:       ocaml-srpm-macros >= 10
 
+# Bundles an MD5 implementation in runtime/caml/md5.h and runtime/md5.c
+Provides:       bundled(md5-plumb)
+
 Provides:       ocaml(compiler) = %{version}
 
 %if %{native_compiler}
@@ -126,11 +139,9 @@ and a comprehensive library.
 #   and runtime/md5.c
 License:        LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception AND LicenseRef-Fedora-Public-Domain
 Summary:        OCaml runtime environment
+Requires:       util-linux
 Provides:       ocaml(runtime) = %{version}
 
-# Bundles an MD5 implementation in runtime/caml/md5.h and runtime/md5.c
-Provides:       bundled(md5-plumb)
-
 %description runtime
 OCaml is a high-level, strongly-typed, functional and object-oriented
 programming language from the ML family of languages.
@@ -248,7 +259,7 @@ sed -i '/^EXTRACAMLFLAGS=/aLINKOPTS=-cclib -lm' otherlibs/unix/Makefile
     --disable-native-compiler \
     --disable-native-toplevel \
 %endif
-%ifarch %{x86_64} %{arm64}
+%ifarch x86_64
 %if 0%{?_include_frame_pointers}
     --enable-frame-pointers \
 %endif
@@ -296,10 +307,7 @@ make -j1 tests ||:
 
 %install
 %make_install
-
-# OCaml 5.5.0 uses relative paths in ld.conf by default to support relocatable
-# OCaml, which we don't need.  Overwrite ld.conf with the absolute path.
-echo %{_libdir}/ocaml/stublibs > $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
+perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
 
 echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
@@ -312,6 +320,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{rpmmacrodir}/macros.ocaml-rpm
 mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 
+# Link, rather than copy, identical binaries
+hardlink -t $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+
 
 %files
 %license LICENSE
@@ -354,6 +365,7 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 %endif
 
 %{_libdir}/ocaml/expunge
+%{_libdir}/ocaml/ld.conf
 %{_libdir}/ocaml/Makefile.config
 
 %{_libdir}/ocaml/*.a
@@ -361,9 +373,11 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 %{_libdir}/ocaml/*.cmxa
 %{_libdir}/ocaml/*.cmx
 %{_libdir}/ocaml/*.o
+%{_libdir}/ocaml/libasmrun_shared.so
 %endif
 %{_libdir}/ocaml/*.mli
 %{_libdir}/ocaml/sys.ml.in
+%{_libdir}/ocaml/libcamlrun_shared.so
 
 %{_libdir}/ocaml/{dynlink,runtime_events,str,threads,unix}/*.mli
 %if %{native_compiler}
@@ -384,18 +398,12 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 %doc README.html Changes
 %license LICENSE
 %{_bindir}/ocamlrun
-%{_bindir}/*ocamlrun-a100
 %{_bindir}/ocamlrund
-%{_bindir}/*ocamlrund-a100
 %{_bindir}/ocamlruni
-%{_bindir}/*ocamlruni-a100
 %dir %{_libdir}/ocaml
-%{_libdir}/ocaml/libasmrun*.so
-%{_libdir}/ocaml/libcamlrun*.so
 %{_libdir}/ocaml/*.cmo
 %{_libdir}/ocaml/*.cmi
 %{_libdir}/ocaml/*.cma
-%{_libdir}/ocaml/ld.conf
 %{_libdir}/ocaml/stublibs
 %dir %{_libdir}/ocaml/dynlink
 %{_libdir}/ocaml/dynlink/META
@@ -455,23 +463,6 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 
 
 %changelog
-* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Tue Jun 23 2026 Jerry James <loganjerry@gmail.com> - 5.5.0-1
-- New upstream version 5.5.0 (RHBZ#2442622)
-- Drop upstreamed fix for arm64 frame pointers
-- Reenable LTO
-- Move ld.conf, libasmrun, and libcamlrun to ocaml-runtime
-- Drop hardlink dependency; rpm now does this by default
-- Drop unused utilx-linux dependency
-
-* Thu Feb 26 2026 Richard W.M. Jones <rjones@redhat.com> - 5.4.1-4
-- Backport fix for arm64 frame pointers
-
-* Fri Feb 20 2026 Richard W.M. Jones <rjones@redhat.com> - 5.4.1-1
-- New upstream version 5.4.1 (RHBZ#2440356)
-
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ocaml-5.5.0.tar.gz) = bf13c18cd1fc7b2e5e9623024ea8623710f646ff2fbc0f59dab70e4d4318ed8623bdcc3ec59ce37af07af2b767f520dea23fb474c26297b3e858b6c8e080b4e6
+SHA512 (ocaml-5.4.0.tar.gz) = 3684468800f4528c9fd96ef3fdd6aa04f71b77180d3ae8045d429f96b32e23cb3a8a307762c7237b6c56c087f45b59b0dab672a31166e3de254bb0fb9b4eb588