diff options
| author | Buildbot system user <buildbot@medusa> | 2018-01-09 23:14:57 +0000 |
|---|---|---|
| committer | Buildbot system user <buildbot@medusa> | 2018-01-09 23:14:57 +0000 |
| commit | 4f0f1377fec5c6d8eb0479f98e717877e5ee67df (patch) | |
| tree | 21641e333e8046056b62649b4a8141bab0d9c3f8 | |
| parent | 384c8d13505f014f8ee68b3a3791d2038d8800b6 (diff) | |
Add configuration for xserver meson build
| -rwxr-xr-x | modulesetparser.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modulesetparser.py b/modulesetparser.py index cc280d0..cd8b0bd 100755 --- a/modulesetparser.py +++ b/modulesetparser.py @@ -327,8 +327,10 @@ def BuilderList(slaves): 'xf86-video-dummy' : '--disable-dga', # config check needs fixing to default to auto, not yes 'xts' : '--disable-shared', 'fontconfig' : '--with-default-fonts=' + os.path.join(prefix, 'share', 'fonts'), + 'xserver-meson' : '-Dudev=false -Dpciaccess=false -Dint10=false -Dsystemd_logind=false -Ddmx=true -Dxephyr=true', } + extra = [] if name in autogenargs: extra = autogenargs[name].split() extra = map(Interpolate, extra) @@ -394,7 +396,7 @@ def BuilderList(slaves): elif m.tag == 'meson': - factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'], name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env)) + factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'] + extra, name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env)) factory.addStep(Compile(command=['ninja', '-C', 'build'], logEnviron=logEnviron, env=env)) factory.addStep(Compile(command=['ninja', '-C', 'build', 'test'], name='test', description='testing', descriptionDone='test', logEnviron=logEnviron, env=env, timeout=3600)) factory.addStep(Compile(command=['ninja', '-C', 'build', 'install'], name='install', description='installing', descriptionDone='install', logEnviron=logEnviron, env=env)) |