Merge pull request #27644 from jmid/conf-diffutils-patch

mseri · web-flow · commit a1aecf33c9fc · 2025-03-19T17:46:39.000+01:00
Patch conf-diffutils's build check on OpenBSD
diff --git a/packages/conf-diffutils/conf-diffutils.2/opam b/packages/conf-diffutils/conf-diffutils.2/opam
@@ -5,7 +5,7 @@ maintainer: "chetsky@gmail.com"
 authors: "GNU Project"
 license: "GPL-3.0-or-later"
 build: [
-  ["diff" "--help"] { os != "freebsd" }
+  ["diff" "--help"] { os != "freebsd" & os != "openbsd" }
   ["gdiff" "--help"] { os = "freebsd" | os = "openbsd" }
 ]
 depexts: [

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ maintainer: "chetsky@gmail.com"`
`5`	`5`	`authors: "GNU Project"`
`6`	`6`	`license: "GPL-3.0-or-later"`
`7`	`7`	`build: [`
`8`		`- ["diff" "--help"] { os != "freebsd" }`
	`8`	`+ ["diff" "--help"] { os != "freebsd" & os != "openbsd" }`
`9`	`9`	`["gdiff" "--help"] { os = "freebsd" \| os = "openbsd" }`
`10`	`10`	`]`
`11`	`11`	`depexts: [`