meson: Add fallback for xmlrpc discovery
PATCH 1/1 meson: Add fallback for xmlrpc discovery
Since Debian-likes (including Ubuntu) ship xmlrpc packages predating the pkg-config era, we need to use xmlrpc-c-config to do the discovery.
Also this patch adds HAVE_CHAMELIUM flag to config.h to get rid of "implicit declaration of function" warnings in case of meson build.
--- meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+)
meson.build +13 -0
@@ -69,9 +69,22 @@ xmlrpc = dependency('xmlrpc', required : false) xmlrpc_util = dependency('xmlrpc_util', required : false) xmlrpc_client = dependency('xmlrpc_client', required : false) +if not xmlrpc.found() + libs_cmd = run_command('xmlrpc-c-config', 'client', '--libs') + cflags_cmd = run_command('xmlrpc-c-config', 'client', '--cflags') + + if libs_cmd.returncode() == 0 and cflags_cmd.returncode() == 0 + xmlrpc = declare_dependency(compile_args: cflags_cmd.stdout().strip().split(), + link_args : libs_cmd.stdout().strip().split()) + xmlrpc_util = declare_dependency() + xmlrpc_client = declare_dependency() + endif +endif + if pixman.found() and xmlrpc.found() and xmlrpc_util.found() and xmlrpc_client.found() chamelium = declare_dependency(dependencies : [ pixman, xmlrpc, xmlrpc_util, xmlrpc_client]) + config.set('HAVE_CHAMELIUM', 1) else chamelium = dependency('', required: false) endif
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for meson: Add fallback for xmlrpc discovery
== Series Details ==
== Series Details ==
Series: meson: Add fallback for xmlrpc discovery
URL : https://patchwork.freedesktop.org/series/32128/
State : failure
== Summary ==
IGT patchset tested on top of latest successful build 6853f8bad8ce5770d28a621a7e15449930d56d9f lib/i915: Extract context priority setparam to a helper
with latest DRM-Tip kernel build CI_DRM_3253920fa3252916 drm-tip: 2017y-10m-17d-09h-45m-06s UTC integration manifest
No testlist changes.
Test gem_exec_reloc:
Subgroup basic-cpu-active:
pass -> FAIL (fi-gdg-551) fdo#102582 +1
Subgroup basic-write-cpu-active:
pass -> FAIL (fi-gdg-551)
Test kms_cursor_legacy:
Subgroup basic-flip-after-cursor-varying-size:
skip -> PASS (fi-hsw-4770r)fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:437s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:451s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:371s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:522s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:264s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:499s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:494s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:496s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:477s fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:559s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:421s fi-gdg-551 total:289 pass:174 dwarn:1 dfail:0 fail:5 skip:109 time:260s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:581s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:426s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:436s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:491s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:487s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:578s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:477s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:582s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:546s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:646s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:521s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:490s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:455s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:570s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:421s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_369/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for meson: Add fallback for xmlrpc discovery
Quoted 16 lines · Patchwork
== Series Details ==
Series: meson: Add fallback for xmlrpc discovery
URL : https://patchwork.freedesktop.org/series/32128/
State : failure== Summary ==
IGT patchset tested on top of latest successful build
6853f8bad8ce5770d28a621a7e15449930d56d9flib/i915: Extract context priority setparam to a helperwith latest DRM-Tip kernel build
CI_DRM_3253920fa3252916drm-tip: 2017y-10m-17d-09h-45m-06s UTC integration manifestNo testlist changes.
Quoted 8 lines
Test
gem_exec_reloc:Subgroup basic-cpu-active: pass -> FAIL (fi-gdg-551) fdo#102582 +1 Subgroup basic-write-cpu-active: pass -> FAIL (fi-gdg-551) Test kms_cursor_legacy: Subgroup basic-flip-after-cursor-varying-size: skip -> PASS (fi-hsw-4770r)
This means that change in the meson build, which we don't use for CI yet, haven't broken autotools compilation. Everything went as expected.
This random flakiness of tests also proved beneficial, as it saved us from an unnecessary sharded run being scheduled :-)
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx