diff --git a/0002-configure-Allow-user-defined-C-compiler-flags.patch b/0002-configure-Allow-user-defined-C-compiler-flags.patch index 9894bc3d738917840e256d328c36515ff8e58fea..2da978d3718997950fbe7664a1b00aef43d6b4b4 100644 --- a/0002-configure-Allow-user-defined-C-compiler-flags.patch +++ b/0002-configure-Allow-user-defined-C-compiler-flags.patch @@ -4,25 +4,25 @@ Date: Tue, 29 May 2012 20:44:18 +0100 Subject: [PATCH 2/2] configure: Allow user defined C compiler flags. --- - configure.ac | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 48aa9f0a29..fc29c88f50 100644 +index 0535f40..d8231ef 100644 --- a/configure.ac +++ b/configure.ac -@@ -925,6 +925,10 @@ AS_CASE([$ocaml_cc_vendor], +@@ -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([$host], - [i686-*-mingw32*], -@@ -2708,7 +2712,7 @@ AC_CONFIG_COMMANDS_PRE([ + AS_CASE([$target], + [i686-w64-mingw32*], +@@ -2849,7 +2853,7 @@ AC_CONFIG_COMMANDS_PRE([ [mkexedebugflag="${mkexe_ldflags_prefix}${mkexedebugflag}"]) mkdll_ldflags="" AS_IF([test -n "${LDFLAGS}"], @@ -31,5 +31,5 @@ index 48aa9f0a29..fc29c88f50 100644 mkdll_ldflags="${mkdll_ldflags} ${mkexe_ldflags_prefix}${flag}" done mkdll_ldflags_exp="$mkdll_ldflags"]) --- -2.44.0 +-- +2.51.0 diff --git a/0003-configure-Remove-incorrect-assumption-about-cross-co.patch b/0003-configure-Remove-incorrect-assumption-about-cross-co.patch index 6f7cd506a2602d9a5e60c7bdc144cca90151247d..ae53ca9597c135e281066fd84bd7823524b402bc 100644 --- a/0003-configure-Remove-incorrect-assumption-about-cross-co.patch +++ b/0003-configure-Remove-incorrect-assumption-about-cross-co.patch @@ -17,22 +17,41 @@ diff --git a/configure.ac b/configure.ac index e2a3cbea0..07c005f09 100644 --- a/configure.ac +++ b/configure.ac -@@ -560,10 +560,11 @@ AS_IF( - +@@ -652,19 +652,20 @@ AS_IF([test x"$enable_ocamldoc" = "xno"], + # Are we building a cross-compiler - + -AS_IF( - [test x"$host" = x"$target"], - [cross_compiler=false], -- [cross_compiler=true]) +- [# We require a non-cross compiler of the same version +- AC_MSG_CHECKING(m4_normalize([if the installed OCaml compiler can build the +- cross compiler])) +- already_installed_version="$(ocamlc -vnum)" +- AS_IF([test x"AC_PACKAGE_VERSION" = x"$already_installed_version"], +- [AC_MSG_RESULT([yes (AC_PACKAGE_VERSION)])], +- [AC_MSG_RESULT(m4_normalize([no (AC_PACKAGE_VERSION vs +- $already_installed_version)])) +- AC_MSG_ERROR([exiting])]) +- cross_compiler=true]) +#AS_IF( +# [test x"$host" = x"$target"], +# [cross_compiler=false], -+# [cross_compiler=true]) ++# [# We require a non-cross compiler of the same version ++# AC_MSG_CHECKING(m4_normalize([if the installed OCaml compiler can build the ++# cross compiler])) ++# already_installed_version="$(ocamlc -vnum)" ++# AS_IF([test x"AC_PACKAGE_VERSION" = x"$already_installed_version"], ++# [AC_MSG_RESULT([yes (AC_PACKAGE_VERSION)])], ++# [AC_MSG_RESULT(m4_normalize([no (AC_PACKAGE_VERSION vs ++# $already_installed_version)])) ++# AC_MSG_ERROR([exiting])]) ++# cross_compiler=true]) +cross_compiler=false - - # Checks for programs - + + # Initialization of libtool + # Allow the MSVC linker to be found even if ld isn't installed. + @@ -1186,17 +1187,17 @@ AS_CASE([$arch], # Assembler diff --git a/0004-add-loongarch64-native-support.patch b/0004-add-loongarch64-native-support.patch index 372a675d39e7648b9f829c0ec24e75f998f5e34e..77c85244f314a516ebe37ebbf06a723509a37815 100644 --- a/0004-add-loongarch64-native-support.patch +++ b/0004-add-loongarch64-native-support.patch @@ -1365,26 +1365,25 @@ diff --git a/configure.ac b/configure.ac index faabd47..cef6a63 100644 --- a/configure.ac +++ b/configure.ac -@@ -1393,7 +1393,8 @@ AS_IF([test x"$supports_shared_libraries" = 'xtrue'], - [aarch64-*-freebsd*], [natdynlink=true], - [aarch64-*-openbsd*], [natdynlink=true], - [aarch64-*-netbsd*], [natdynlink=true], -- [riscv*-*-linux*], [natdynlink=true])]) -+ [riscv*-*-linux*], [natdynlink=true], +@@ -1493,6 +1493,7 @@ AS_IF([test x"$supports_shared_libraries" = 'xtrue'], + [riscv*-*-linux*], [natdynlink=true], + [[i[3456]86-*-gnu*]], [natdynlink=true], +- [x86_64-*-gnu*], [natdynlink=true])]) ++ [x86_64-*-gnu*], [natdynlink=true], + [loongarch*-*-linux*], [natdynlink=true])]) - - AS_CASE([$enable_native_toplevel,$natdynlink], - [yes,false], -@@ -1523,7 +1524,9 @@ AS_CASE([$host], - [x86_64-*-cygwin*], - [has_native_backend=yes; arch=amd64; system=cygwin], + + # Try to work around the Skylake/Kaby Lake processor bug. + AS_CASE(["$ocaml_cc_vendor,$target"], +@@ -1614,7 +1615,9 @@ AS_CASE([$target], [riscv64-*-linux*], -- [has_native_backend=yes; arch=riscv; model=riscv64; system=linux] -+ [has_native_backend=yes; arch=riscv; model=riscv64; system=linux], + [has_native_backend=yes; arch=riscv; model=riscv64; system=linux], + [x86_64-*-gnu*], +- [has_native_backend=yes; arch=amd64; system=gnu] ++ [has_native_backend=yes; arch=amd64; system=gnu], + [loongarch64-*-linux*], + [has_native_backend=yes; arch=loongarch64; system=linux] ) - + AS_CASE([$arch], @@ -1637,7 +1640,7 @@ default_aspp="$CC -c" AS_CASE([$as_target,$ocaml_cc_vendor], diff --git a/ocaml-5.3.0.tar.gz b/ocaml-5.3.0.tar.gz deleted file mode 100644 index a94b8b6beccdd6d1b4c86779d08fec7fb0a7406b..0000000000000000000000000000000000000000 --- a/ocaml-5.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb9eab2f21758d3cfb1e78c7f83f0b4dd6302824316aba4abee047a5a4f85029 -size 6239856 diff --git a/ocaml-5.4.0.tar.gz b/ocaml-5.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bd90d9e78084b137dd3afc346be2bfc2f24db3e4 Binary files /dev/null and b/ocaml-5.4.0.tar.gz differ diff --git a/ocaml.spec b/ocaml.spec index 9d5f6cb9d5b609a384befee1b0254d67954694d4..4e453a5b5ddffdecd9661c8816eebdeccf752dc4 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -3,8 +3,8 @@ %global natdynlink 1 Name: ocaml -Version: 5.3.0 -Release: 3 +Version: 5.4.0 +Release: 1 Summary: OCaml compiler and programming environment License: LGPL-2.1-only URL: https://www.ocaml.org @@ -279,7 +279,7 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/%{_vendor} %files rpm-macros %{rpmmacrodir}/macros.ocaml-rpm -%{_rpmconfigdir}/%{_vendor}/ocaml_files.py +%{_rpmconfigdir}/%{_vendor}/* %files srpm-macros %{rpmmacrodir}/macros.ocaml-srpm @@ -289,6 +289,12 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/%{_vendor} %{_mandir}/man3/* %changelog +* Sat Oct 11 2025 zhang_wenyu - 5.4.0-1 +- Update to 5.4.0 + * Fix a typo in the Repr.compare documentation + * Unicode changes in Format should be treated as breaking changes + * Fix wrong TSan function names + * Thu Apr 24 2025 wangkai <13474090681@163.com> - 5.3.0-3 - Fix requires