diff options
Diffstat (limited to 'waftools/checks')
| -rw-r--r-- | waftools/checks/custom.py | 30 | ||||
| -rw-r--r-- | waftools/checks/generic.py | 23 |
2 files changed, 47 insertions, 6 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 50a16ce26a..8ed06e5b24 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -4,7 +4,7 @@ from waflib import Utils import os __all__ = ["check_pthreads", "check_iconv", "check_lua", "check_oss_4front", - "check_cocoa", "check_openal"] + "check_cocoa", "check_openal", "check_rpi"] pthreads_program = load_fragment('pthreads.c') @@ -50,6 +50,8 @@ def check_iconv(ctx, dependency_identifier): if ctx.env.DEST_OS == 'openbsd' or ctx.env.DEST_OS == 'freebsd': args['cflags'] = '-I/usr/local/include' args['linkflags'] = '-L/usr/local/lib' + elif ctx.env.DEST_OS == 'win32': + args['linkflags'] = " ".join(['-L' + x for x in ctx.env.LIBRARY_PATH]) checkfn = check_cc(**args) return check_libs(libs, checkfn)(ctx, dependency_identifier) @@ -127,3 +129,29 @@ def check_openal(ctx, dependency_identifier): if fn(ctx, dependency_identifier): return True return False + +def check_rpi(ctx, dependency_identifier): + # We need MMAL/bcm_host/dispmanx APIs. + # Upstream keeps pkgconfig files in '/opt/vc/lib/pkgconfig'. + # See https://github.com/raspberrypi/userland/issues/245 + # PKG_CONFIG_SYSROOT_DIR helps with cross compilation. + prev_pkg_path = os.getenv('PKG_CONFIG_PATH', '') + os.environ['PKG_CONFIG_PATH'] = os.pathsep.join( + filter(None, [os.path.join(os.getenv('PKG_CONFIG_SYSROOT_DIR', '/'), + 'opt/vc/lib/pkgconfig'), + prev_pkg_path])) + + checks = [ + check_pkg_config('bcm_host', uselib_store='bcm_host'), + check_pkg_config('egl'), + check_pkg_config('glesv2'), + check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']), + # We still need all OpenGL symbols, because the vo_opengl code is + # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. + check_statement('GL/gl.h', '(void)GL_RGB32F'), # arbitrary OpenGL 3.0 symbol + check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol + ] + + ret = all((fn(ctx, dependency_identifier) for fn in checks)) + os.environ['PKG_CONFIG_PATH'] = prev_pkg_path + return ret diff --git a/waftools/checks/generic.py b/waftools/checks/generic.py index 8da8467798..153cf9463d 100644 --- a/waftools/checks/generic.py +++ b/waftools/checks/generic.py @@ -4,7 +4,8 @@ from waflib.ConfigSet import ConfigSet from waflib import Utils __all__ = [ - "check_pkg_config", "check_pkg_config_cflags", "check_cc", "check_statement", "check_libs", + "check_pkg_config", "check_pkg_config_mixed", "check_pkg_config_mixed_all", + "check_pkg_config_cflags", "check_cc", "check_statement", "check_libs", "check_headers", "compose_checks", "check_true", "any_version", "load_fragment", "check_stub", "check_ctx_vars", "check_program"] @@ -69,24 +70,34 @@ def check_cc(**kw_ext): return fn def check_pkg_config(*args, **kw_ext): - return _check_pkg_config(["--libs", "--cflags"], *args, **kw_ext) + return _check_pkg_config([], ["--libs", "--cflags"], *args, **kw_ext) + +def check_pkg_config_mixed(_dyn_libs, *args, **kw_ext): + return _check_pkg_config([_dyn_libs], ["--libs", "--cflags"], *args, **kw_ext) + +def check_pkg_config_mixed_all(*all_args, **kw_ext): + args = [all_args[i] for i in [n for n in range(0, len(all_args)) if n % 3]] + return _check_pkg_config(all_args[::3], ["--libs", "--cflags"], *args, **kw_ext) def check_pkg_config_cflags(*args, **kw_ext): - return _check_pkg_config(["--cflags"], *args, **kw_ext) + return _check_pkg_config([], ["--cflags"], *args, **kw_ext) -def _check_pkg_config(_pkgc_args, *args, **kw_ext): +def _check_pkg_config(_dyn_libs, _pkgc_args, *args, **kw_ext): def fn(ctx, dependency_identifier, **kw): argsl = list(args) packages = args[::2] verchecks = args[1::2] sargs = [] pkgc_args = _pkgc_args + dyn_libs = {} for i in range(0, len(packages)): if i < len(verchecks): sargs.append(packages[i] + ' ' + verchecks[i]) else: sargs.append(packages[i]) - if ctx.dependency_satisfied('static-build'): + if _dyn_libs and _dyn_libs[i]: + dyn_libs[packages[i]] = _dyn_libs[i] + if ctx.dependency_satisfied('static-build') and not dyn_libs: pkgc_args += ["--static"] defaults = { @@ -108,6 +119,8 @@ def _check_pkg_config(_pkgc_args, *args, **kw_ext): defkey = inflector.define_key(dependency_identifier) if result: ctx.define(defkey, 1) + for x in dyn_libs.keys(): + ctx.env['LIB_'+x] += dyn_libs[x] else: ctx.add_optional_message(dependency_identifier, "'{0}' not found".format(" ".join(sargs))) |