]> granicus.if.org Git - handbrake/commitdiff
Fix diff command check for FreeBSD.
authorYuichiro NAITO <naito.yuichiro@gmail.com>
Tue, 22 May 2018 01:12:04 +0000 (10:12 +0900)
committerBradley Sepos <bradley@bradleysepos.com>
Mon, 28 May 2018 02:28:08 +0000 (22:28 -0400)
FreeBSD's diff doesn't support --version option.
Use hash command to check if diff is available or not.

(cherry picked from commit fd2241a344b141fb5f1b8ec479dbb5783826f1ce)

contrib/libvpx/P02-freebsd-configure.patch [new file with mode: 0644]

diff --git a/contrib/libvpx/P02-freebsd-configure.patch b/contrib/libvpx/P02-freebsd-configure.patch
new file mode 100644 (file)
index 0000000..c5b3801
--- /dev/null
@@ -0,0 +1,11 @@
+--- libvpx-1.7.0/configure.orig        2018-01-25 07:25:44.000000000 +0900
++++ libvpx-1.7.0/configure     2018-05-21 22:21:02.266701000 +0900
+@@ -170,7 +170,7 @@
+     [ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
+ done
+-if ! diff --version >/dev/null; then
++if ! hash diff 2>/dev/null; then
+   die "diff missing: Try installing diffutils via your package manager."
+ fi