Use gpatch on NetBSD and DragonFlyBSD

kit-ty-kate · May 7, 2024 · 5214609 · 5214609
1 parent 2c87bed
commit 5214609
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml
@@ -50,12 +50,16 @@ let linux_filter = os_filter "linux"
 let macos_filter = os_filter "macos"
 let openbsd_filter = os_filter "openbsd"
 let freebsd_filter = os_filter "freebsd"
+let netbsd_filter = os_filter "netbsd"
+let dragonflybsd_filter = os_filter "dragonfly"
 let not_open_free_bsd_filter =
   FNot (FOr (openbsd_filter,  freebsd_filter))
 let win32_filter = os_filter "win32"
 let sandbox_filter = FOr (linux_filter, macos_filter)
 
-let gpatch_filter = FOr (openbsd_filter, freebsd_filter)
+let gpatch_filter =
+  FOr (FOr (openbsd_filter, netbsd_filter),
+       FOr (freebsd_filter, dragonflybsd_filter))
 let patch_filter = FNot gpatch_filter
 
 let gtar_filter = openbsd_filter

diff --git a/src/core/opamSystem.ml b/src/core/opamSystem.ml
@@ -1511,9 +1511,16 @@ let gpatch = lazy begin
   in
   let default_cmd, other_cmds =
     match OpamStd.Sys.os () with
-    | OpamStd.Sys.OpenBSD
-    | OpamStd.Sys.FreeBSD -> ("gpatch", ["patch"])
-    | _ -> ("patch", ["gpatch"])
+    | DragonFly
+    | FreeBSD
+    | NetBSD
+    | OpenBSD -> ("gpatch", ["patch"])
+    | Cygwin
+    | Darwin
+    | Linux
+    | Unix
+    | Win32
+    | Other _ -> ("patch", ["gpatch"])
   in
   match search_gpatch (default_cmd :: other_cmds) with
   | Some gpatch -> gpatch