diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-03-21 14:08:45 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-03-26 13:43:26 +1100 |
| commit | 902119ec87dee2a9d85d15669113e41321b79588 (patch) | |
| tree | cf2e0a4af5a3291833085acd39db6603f756aff8 | |
| parent | sb: Add the `release_path` key to the `version` section in the VERSION file. (diff) | |
| download | rtems-source-builder-902119ec87dee2a9d85d15669113e41321b79588.tar.bz2 | |
freebsd: Update makeinfo and install-info paths on FreeBSD 11.0
Close #2947.
| -rw-r--r-- | source-builder/sb/freebsd.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source-builder/sb/freebsd.py b/source-builder/sb/freebsd.py index 952463f..2c519a1 100644 --- a/source-builder/sb/freebsd.py +++ b/source-builder/sb/freebsd.py @@ -78,7 +78,8 @@ def load(): # 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: + fb_version = int(float(version)) + if fb_version >= 10: # # FreeBSD has switched to clang plus gcc. On 10.0 cc is gcc based and # clang is provided however it is not building binutils-2.24. @@ -110,6 +111,13 @@ def load(): # Fix the mess iconv is on FreeBSD 10.0. # defines['iconv_includes'] = ('none', 'none', '-I/usr/local/include -L/usr/local/lib') + + # + # On 11.0+ makeinfo and install-info have moved to /usr/local/... + # + if fb_version >= 11: + defines['__install_info'] = ('exe', 'optional', '/usr/local/bin/install-info') + defines['__makeinfo'] = ('exe', 'required', '/usr/local/bin/makeinfo') else: for gv in ['49', '48', '47']: gcc = '%s-portbld-freebsd%s-gcc%s' % (cpu, version, gv) |