rpms/virt-v2v
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove OCaml 5 patch

Browse Source 
Equivalent change is now upstream.
This commit is contained in:
Richard W.M. Jones 2023-07-14 15:23:16 +01:00
parent 2eb925871d
commit 19b8f91663
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
virt-v2v-ocaml5.patch
View File

@ -1,17 +0,0 @@
--- virt-v2v-2.3.4/common/mlstdutils/std_utils.ml.orig 2023-02-20 12:00:29.154785477 -0700
+++ virt-v2v-2.3.4/common/mlstdutils/std_utils.ml 2023-07-10 09:34:10.295869331 -0600
@@ -341,12 +341,12 @@ module List = struct
| x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs
| _ -> invalid_arg "combine3"
- let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function
+ let rec assoc_lbl ?(cmp = Stdlib.compare) ~default x = function
| [] -> default
| (y, y') :: _ when cmp x y = 0 -> y'
| _ :: ys -> assoc_lbl ~cmp ~default x ys
- let uniq ?(cmp = Pervasives.compare) xs =
+ let uniq ?(cmp = Stdlib.compare) xs =
let rec loop acc = function
| [] -> acc
| [x] -> x :: acc

5
virt-v2v.spec
View File

@ -6,7 +6,7 @@
%global patches_touch_autotools %{nil}
%else
# On RHEL the downstream patches always touch autotools files.
%global patches_touch_autotools 1
%global patches_touch_autotools %{nil}
%endif
# The source directory.
@ -31,9 +31,6 @@ Source2: libguestfs.keyring
# Maintainer script which helps with handling patches.
Source3: copy-patches.sh
# Adapt to OCaml 5.0.0
Patch0: %{name}-ocaml5.patch
%if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no
# kernel built for this architecture any longer and libguestfs rather