Mesa (master): scons: Require same pkg-config versions as configure.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Feb 7 11:41:51 UTC 2012
Module: Mesa
Branch: master
Commit: 2470e918cc29e5d057a28551ce9c15e7d83fab7e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2470e918cc29e5d057a28551ce9c15e7d83fab7e
Author: José Fonseca <jfonseca at vmware.com>
Date: Tue Feb 7 11:17:35 2012 +0000
scons: Require same pkg-config versions as configure.
---
scons/custom.py | 5 ++++-
scons/gallium.py | 12 ++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/scons/custom.py b/scons/custom.py
index 0807316..cc953bd 100644
--- a/scons/custom.py
+++ b/scons/custom.py
@@ -174,6 +174,9 @@ def _pkg_check_modules(env, name, modules):
if subprocess.call(["pkg-config", "--exists", ' '.join(modules)]) != 0:
return
+ # Strip version expressions from modules
+ modules = [module.split(' ', 1)[0] for module in modules]
+
# Other flags may affect the compilation of unrelated targets, so store
# them with a prefix, (e.g., XXX_CFLAGS, XXX_LIBS, etc)
try:
@@ -189,7 +192,7 @@ def _pkg_check_modules(env, name, modules):
def pkg_check_modules(env, name, modules):
- sys.stdout.write('Checking for %s...' % name)
+ sys.stdout.write('Checking for %s (%s)...' % (name, ' '.join(modules)))
_pkg_check_modules(env, name, modules)
result = env['HAVE_' + name]
sys.stdout.write(' %s\n' % ['no', 'yes'][int(bool(result))])
diff --git a/scons/gallium.py b/scons/gallium.py
index eed89cf..c7e9e9c 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -507,12 +507,12 @@ def generate(env):
env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes'])
env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx'])
env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
- env.PkgCheckModules('DRM', ['libdrm'])
- env.PkgCheckModules('DRM_INTEL', ['libdrm_intel'])
- env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon'])
- env.PkgCheckModules('XORG', ['xorg-server'])
- env.PkgCheckModules('KMS', ['libkms'])
- env.PkgCheckModules('UDEV', ['libudev'])
+ env.PkgCheckModules('DRM', ['libdrm >= 2.4.24'])
+ env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.38'])
+ env.PkgCheckModules('DRM_RADEON', ['libdrm_radeon >= 2.4.31'])
+ env.PkgCheckModules('XORG', ['xorg-server >= 1.6.0'])
+ env.PkgCheckModules('KMS', ['libkms >= 2.4.24'])
+ env.PkgCheckModules('UDEV', ['libudev > 150'])
env['dri'] = env['x11'] and env['drm']
More information about the mesa-commit
mailing list