From fc619d8d222ba31a94496dee5c956161c389a5d0 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 5 Nov 2012 07:54:06 +1100 Subject: [PATCH] Make FreeBSD pass the check. --- sb/defaults.py | 4 ++-- sb/freebsd.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sb/defaults.py b/sb/defaults.py index 72ba800..15e55b9 100644 --- a/sb/defaults.py +++ b/sb/defaults.py @@ -130,8 +130,8 @@ defaults = { '__mkdir_p': ('exe', 'none', '/bin/mkdir -p'), '__mv': ('exe', 'required', '/bin/mv'), '__nm': ('exe', 'required', '/usr/bin/nm'), -'__objcopy': ('exe', 'optional', '%{_bindir}/objcopy'), -'__objdump': ('exe', 'optional', '%{_bindir}/objdump'), +'__objcopy': ('exe', 'optional', '/usr/bin//objcopy'), +'__objdump': ('exe', 'optional', '/usr/bin/objdump'), '__patch': ('exe', 'required', '/usr/bin/patch'), '__perl': ('exe', 'optional', 'perl'), '__ranlib': ('exe', 'required', 'ranlib'), diff --git a/sb/freebsd.py b/sb/freebsd.py index 4f88266..18a2c84 100644 --- a/sb/freebsd.py +++ b/sb/freebsd.py @@ -53,10 +53,11 @@ def load(): '_host_cpu': ('none', 'none', cpu), '_host_alias': ('none', 'none', '%{nil}'), '_host_arch': ('none', 'none', cpu), - '_usr': ('dir', 'required', '/usr/local', - '_var': ('dir', 'required', '/usr/local/var'), + '_usr': ('dir', 'required', '/usr/local'), + '_var': ('dir', 'optional', '/usr/local/var'), 'optflags': ('none', 'none', '-O2 -I/usr/local/include -L/usr/local/lib'), '_smp_mflags': ('none', 'none', smp_mflags), + '__bash': ('exe', 'optional', '/usr/local//bin/bash'), '__xz': ('exe', 'optional', '/usr/bin/xz'), '__make': ('exe', 'required', 'gmake') }