[PATCH i-g-t 1/2] meson: don't assume xmlrpc-c-config is there

[PATCH i-g-t 1/2] meson: don't assume xmlrpc-c-config is there

[Jani Nikula]

xmlrpc is an optional dependency. If pkg-config can't find it, don't
assume xmlrpc-c-config will be there either. Make xmlrpc-c-config
optional too.

Fixes error:

Meson encountered an error in file meson.build, line 73, column 1:
Program or command 'xmlrpc-c-config' not foundor not executable

Fixes: 892abc602a8a ("meson: Add fallback for xmlrpc discovery")
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Note: Untested in the scenario described in 892abc602a8a ("meson: Add
fallback for xmlrpc discovery")
---
 meson.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index ac991c2f9bf2..fb81c4dbbd55 100644
--- a/meson.build
+++ b/meson.build
@@ -69,9 +69,10 @@ 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')
+xmlrpc_cmd = find_program('xmlrpc-c-config', required : false)
+if not xmlrpc.found() and xmlrpc_cmd.found()
+	libs_cmd = run_command(xmlrpc_cmd, 'client', '--libs')
+	cflags_cmd = run_command(xmlrpc_cmd, 'client', '--cflags')
 
 	if libs_cmd.returncode() == 0 and cflags_cmd.returncode() == 0
 		xmlrpc = declare_dependency(compile_args: cflags_cmd.stdout().strip().split(),
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 2/2] meson: intel_dp_compliance depends on libudev

[Jani Nikula]

Only build intel_dp_compliance when libudev is available, also include
libudev in the list of dependencies.

Fixes error when libudev isn't there:

../tools/intel_dp_compliance_hotplug.c:33:21: fatal error: libudev.h: No such file or directory
 #include <libudev.h>

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 tools/meson.build | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/meson.build b/tools/meson.build
index 1bacac58647a..7fc5390a6f63 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -57,10 +57,15 @@ endforeach
 
 pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
 
-intel_dp_compliance_src = [ 'intel_dp_compliance.c', 'intel_dp_compliance_hotplug.c' ]
-executable('intel_dp_compliance', sources : intel_dp_compliance_src,
-	   dependencies : tool_deps,
-	   install : true)
+if libudev.found()
+	intel_dp_compliance_src = [
+		'intel_dp_compliance.c',
+		'intel_dp_compliance_hotplug.c'
+	]
+	executable('intel_dp_compliance', sources : intel_dp_compliance_src,
+		   dependencies : [tool_deps, libudev],
+		   install : true)
+endif
 
 intel_l3_parity_src = [ 'intel_l3_parity.c', 'intel_l3_udev_listener.c' ]
 executable('intel_l3_parity', sources : intel_l3_parity_src,
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for series starting with [1/2] meson: don't assume xmlrpc-c-config is there

[Patchwork]

== Series Details ==

Series: series starting with [1/2] meson: don't assume xmlrpc-c-config is there
URL   : https://patchwork.freedesktop.org/series/32511/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
cdfe992134b478b76e0763773e9d4e82bba5b98f tests/kms_plane_lowres: Rework tests to work without fbcon, v3.

with latest DRM-Tip kernel build CI_DRM_3276
5c82a37eff83 drm-tip: 2017y-10m-23d-18h-06m-28s UTC integration manifest

No testlist changes.

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:434s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:455s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:370s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:531s
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:509s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:498s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:497s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:481s
fi-cfl-s         total:289  pass:253  dwarn:4   dfail:0   fail:0   skip:32  time:563s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:408s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:251s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:588s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:433s
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:433s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:494s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:462s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:493s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:571s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:480s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:591s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:540s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:450s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:651s
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:504s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:458s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:566s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:419s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_399/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for series starting with [1/2] meson: don't assume xmlrpc-c-config is there

[Patchwork]

== Series Details ==

Series: series starting with [1/2] meson: don't assume xmlrpc-c-config is there
URL   : https://patchwork.freedesktop.org/series/32511/
State : success

== Summary ==

Test drv_module_reload:
        Subgroup basic-reload:
                pass       -> DMESG-WARN (shard-hsw) fdo#102707
Test kms_busy:
        Subgroup extended-modeset-hang-oldfb-with-reset-render-A:
                dmesg-warn -> PASS       (shard-hsw) fdo#102249
Test perf:
        Subgroup polling:
                fail       -> PASS       (shard-hsw) fdo#102252
Test kms_setmode:
        Subgroup basic:
                pass       -> FAIL       (shard-hsw) fdo#99912

fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

shard-hsw        total:2540 pass:1431 dwarn:3   dfail:0   fail:9   skip:1097 time:9254s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_399/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 1/2] meson: don't assume xmlrpc-c-config is there

[Arkadiusz Hiler]

On Tue, Oct 24, 2017 at 11:14:14AM +0300, Jani Nikula wrote:
> xmlrpc is an optional dependency. If pkg-config can't find it, don't
> assume xmlrpc-c-config will be there either. Make xmlrpc-c-config
> optional too.
> 
> Fixes error:
> 
> Meson encountered an error in file meson.build, line 73, column 1:
> Program or command 'xmlrpc-c-config' not foundor not executable
> 
> Fixes: 892abc602a8a ("meson: Add fallback for xmlrpc discovery")
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Both patches are:

Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
and pushed. Thanks!


> ---
> 
> Note: Untested in the scenario described in 892abc602a8a ("meson: Add
> fallback for xmlrpc discovery")
> ---
>  meson.build | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index ac991c2f9bf2..fb81c4dbbd55 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -69,9 +69,10 @@ 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')
> +xmlrpc_cmd = find_program('xmlrpc-c-config', required : false)
> +if not xmlrpc.found() and xmlrpc_cmd.found()
> +	libs_cmd = run_command(xmlrpc_cmd, 'client', '--libs')
> +	cflags_cmd = run_command(xmlrpc_cmd, 'client', '--cflags')
>  
>  	if libs_cmd.returncode() == 0 and cflags_cmd.returncode() == 0
>  		xmlrpc = declare_dependency(compile_args: cflags_cmd.stdout().strip().split(),
> -- 
> 2.11.0
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for series starting with [1/2] meson: don't assume xmlrpc-c-config is there

[Patchwork]

== Series Details ==

Series: series starting with [1/2] meson: don't assume xmlrpc-c-config is there
URL   : https://patchwork.freedesktop.org/series/32511/
State : failure

== Summary ==

Series 32511 revision 1 was fully merged or fully failed: no git log

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_399/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for series starting with [1/2] meson: don't assume xmlrpc-c-config is there

[Patchwork]

== Series Details ==

Series: series starting with [1/2] meson: don't assume xmlrpc-c-config is there
URL   : https://patchwork.freedesktop.org/series/32511/
State : failure

== Summary ==

Series 32511 revision 1 was fully merged or fully failed: no git log

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_399/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx