From b7a13abd4b9343c540e608934c477fe1fc9aa7d7 Mon Sep 17 00:00:00 2001 From: Nick Withers Date: Tue, 7 Jan 2014 10:04:49 +1100 Subject: [PATCH] FreeBSD 10 and above no longer have /usr/bin/cvs - allow it to be found in the path (e.g., from a devel/cvs ports install) --- source-builder/sb/freebsd.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source-builder/sb/freebsd.py b/source-builder/sb/freebsd.py index 612f489..846cd2f 100644 --- a/source-builder/sb/freebsd.py +++ b/source-builder/sb/freebsd.py @@ -1,6 +1,6 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2010-2012 Chris Johns (chrisj@rtems.org) +# Copyright 2010-2014 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -73,6 +73,12 @@ def load(): defines['_build_alias'] = defines['_host_alias'] defines['_build_arch'] = defines['_host_arch'] + # FreeBSD 10 and above no longer have /usr/bin/cvs, but it can (e.g.) be installed to /usr/local/bin/cvs through the devel/cvs port + if int(float(version)) >= 10: + cvs = 'cvs' + if check.check_exe(cvs, cvs): + defines['__cvs'] = cvs + for gv in ['47', '48', '49']: gcc = '%s-portbld-freebsd%s-gcc%s' % (cpu, version, gv) if check.check_exe(gcc, gcc):