From b78c1288b289d9f58bc80d66824d76dbdd31b508 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 21 Mar 2013 20:37:15 +1100 Subject: [PATCH] Patch on FreeBSD needs to have -E to remove empty files. This is the Linux default. --- source-builder/sb/defaults.py | 3 ++- source-builder/sb/freebsd.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source-builder/sb/defaults.py b/source-builder/sb/defaults.py index c3903e4..8f17095 100644 --- a/source-builder/sb/defaults.py +++ b/source-builder/sb/defaults.py @@ -138,7 +138,8 @@ defaults = { '__nm': ('exe', 'required', '/usr/bin/nm'), '__objcopy': ('exe', 'optional', '/usr/bin/objcopy'), '__objdump': ('exe', 'optional', '/usr/bin/objdump'), -'__patch': ('exe', 'required', '/usr/bin/patch'), +'__patch_bin': ('exe', 'required', '/usr/bin/patch'), +'__patch': ('exe', 'none', '%{__patch_bin} %{__patch_opts}'), '__perl': ('exe', 'optional', 'perl'), '__ranlib': ('exe', 'required', 'ranlib'), '__rm': ('exe', 'required', '/bin/rm'), diff --git a/source-builder/sb/freebsd.py b/source-builder/sb/freebsd.py index c5569bd..eb78fa2 100644 --- a/source-builder/sb/freebsd.py +++ b/source-builder/sb/freebsd.py @@ -61,7 +61,8 @@ def load(): '__bison': ('exe', 'required', '/usr/local/bin/bison'), '__git': ('exe', 'required', '/usr/local/bin/git'), '__xz': ('exe', 'optional', '/usr/bin/xz'), - '__make': ('exe', 'required', 'gmake') + '__make': ('exe', 'required', 'gmake'), + '__patch_opts': ('none', 'none', '-E') } return defines