From a2ff468955f202dfa301cb5cf19c2027aa8c8fcc Mon Sep 17 00:00:00 2001 From: leffmann Date: Mon, 18 Jan 2016 19:14:54 +0100 Subject: [PATCH] Verify prerequisites --- common.py | 27 +++++++++++++++++++++++++-- toolchain-m68k | 8 ++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/common.py b/common.py index ba8b005..1f94a57 100644 --- a/common.py +++ b/common.py @@ -3,7 +3,7 @@ from fnmatch import fnmatch from glob import glob from logging import debug, info, error -from os import path +from os import path, environ import contextlib import distutils.spawn import os @@ -450,8 +450,31 @@ def make(name, target=None, **makevars): execute('make', *args) +def require_header(header, symbol = False, value = False): + debug('require_header "%s"', header) + cmd = environ['CC'].split() + ['-fsyntax-only', '-x', 'c', '-'] + proc = subprocess.Popen(cmd, stdin = subprocess.PIPE, env = environ) + + 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) + + proc.communicate(stdin_line) + proc.wait() + + if proc.returncode != 0: + panic('require_header "%s" failed', header) + + __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..1d57fe3 100755 --- a/toolchain-m68k +++ b/toolchain-m68k @@ -241,6 +241,14 @@ def build(): path.join('{host}', 'bin'), environ['PATH']]) + """ + When we have a working compiler in our path, we can also check if the + required headers/libraries are present. + """ + + require_header('') + require_header('', symbol = 'NCURSES_VERSION_MAJOR', value = 5) + unpack('{m4}') configure('{m4}', '--prefix={host}') make('{m4}')