diff --git a/common.py b/common.py index ba8b005..d04c6be 100644 --- a/common.py +++ b/common.py @@ -450,8 +450,38 @@ def make(name, target=None, **makevars): execute('make', *args) +def require_header(header, lang, msg = '', symbol = False, value = False): + debug('require_header "%s"', header) + + cmd = {'c':'{cc}', 'c++':'{cxx}'}[lang] + cmd = fill_in(cmd).split() + ['-fsyntax-only', '-x', lang, '-'] + proc = subprocess.Popen(cmd, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.PIPE) + + stdin_line = '#include <' + header + '>' + if symbol: + if value: + stdin_line += """\n#if %s != %s + #error + #endif """ % (symbol, value) + else: + stdin_line += """\n#ifndef %s + #error + #endif """ % (symbol) + + (result_stdout, result_stderr) = proc.communicate(stdin_line) + proc.wait() + + cmd = ' '.join(cmd) + + if proc.returncode == 0: + debug('output from "%s":\n%s', cmd, result_stdout) + else: + debug('error output from "%s":\n%s', cmd, result_stderr) + panic('require_header failed: %s', msg) + + __all__ = ['setvar', 'panic', 'cmpver', 'find_executable', 'chmod', 'execute', 'rmtree', 'mkdir', 'copy', 'copytree', 'unarc', 'fetch', 'cwd', 'symlink', 'remove', 'move', 'find', 'textfile', 'env', 'path', 'add_site_dir', 'python_setup', 'recipe', 'unpack', 'patch', - 'configure', 'make'] + 'configure', 'make', 'require_header'] diff --git a/toolchain-m68k b/toolchain-m68k index b302587..75718ff 100755 --- a/toolchain-m68k +++ b/toolchain-m68k @@ -241,6 +241,15 @@ def build(): path.join('{host}', 'bin'), environ['PATH']]) + setvar(cc = environ['CC'], cxx = environ['CXX']) + + """ + When we have a working compiler in our path, we can also check if the + required headers/libraries are present. + """ + + require_header('ncurses.h', 'c', 'libncurses-dev 5.x missing', 'NCURSES_VERSION_MAJOR', 5) + unpack('{m4}') configure('{m4}', '--prefix={host}') make('{m4}')