Changeset 462f915 in rtems-source-builder


Ignore:
Timestamp:
Mar 21, 2017, 3:08:45 AM (2 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.11
Children:
97b4399
Parents:
1675a73
Message:

freebsd: Update makeinfo and install-info paths on FreeBSD 11.0

Close #2947.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source-builder/sb/freebsd.py

    r1675a73 r462f915  
    7878    # FreeBSD 10 and above no longer have /usr/bin/cvs, but it can (e.g.) be
    7979    # installed to /usr/local/bin/cvs through the devel/cvs port
    80     if int(float(version)) >= 10:
     80    fb_version = int(float(version))
     81    if fb_version >= 10:
    8182        #
    8283        # FreeBSD has switched to clang plus gcc. On 10.0 cc is gcc based and
     
    110111        #
    111112        defines['iconv_includes'] = ('none', 'none', '-I/usr/local/include -L/usr/local/lib')
     113
     114        #
     115        # On 11.0+ makeinfo and install-info have moved to /usr/local/...
     116        #
     117        if fb_version >= 11:
     118            defines['__install_info'] = ('exe', 'optional', '/usr/local/bin/install-info')
     119            defines['__makeinfo']     = ('exe', 'required', '/usr/local/bin/makeinfo')
    112120    else:
    113121        for gv in ['49', '48', '47']:
Note: See TracChangeset for help on using the changeset viewer.