meson: do not use cairo/valgrind if disabled
A message that is not in the archive (sent off-list or not yet received): [email protected]
Eric Engestrom
Reviewed-byQuoted 2 lines · Igor Gnatenko
-Dcairo-tests=false currently results into enabling cairo support if it was found. Same for valgrind.
Indeed, this was wrong; thanks for the fix!
Do you have commit access, or do you want me to push this for you?
Quoted 11 lines
Signed-off-by Igor Gnatenko <[email protected]>--- meson.build | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)meson.build +0
-0
meson.build endforeach · line 233
Quoted 10 lines
meson.build +5
-2@@ -226,8 +226,20 @@ endforeach dep_pciaccess = dependency('pciaccess', version : '>= 0.10', required : with_intel) dep_cunit = dependency('cunit', version : '>= 2.1', required : false) -dep_cairo = dependency('cairo', required : with_cairo_tests == 'true') -dep_valgrind = dependency('valgrind', required : with_valgrind == 'true') +if with_cairo_tests != 'false' + dep_cairo = dependency('cairo', required : with_cairo_tests == 'true') + with_cairo_tests = dep_cairo.found() +else + dep_cairo = declare_dependency()
Nit: dep_cairo = [] is enough; I'll change that if I'm the one to push it.
meson.build endforeach · line 234
Quoted 1 line
meson.build +1
-0+ with_cairo_tests = false
We try to avoid changing the type of a var; could you send a follow-up patch to rename the get_option() var to _cairo_tests?
(same obviously applies for the valgrind bits)
Quoted 25 lines
meson.build +10
-2+endif +if with_valgrind != 'false' + dep_valgrind = dependency('valgrind', required : with_valgrind == 'true') + with_valgrind = dep_valgrind.found() +else + dep_valgrind = declare_dependency() + with_valgrind = false +endif with_man_pages = get_option('man-pages') prog_xslt = find_program('xsltproc', required : with_man_pages == 'true')@@ -259,8 +271,8 @@ foreach t : [ [with_radeon, 'RADEON'], [with_vc4, 'VC4'], [with_vmwgfx, 'VMWGFX'], - [dep_cairo.found(), 'CAIRO'], - [dep_valgrind.found(), 'VALGRIND'], + [with_cairo_tests, 'CAIRO'], + [with_valgrind, 'VALGRIND'], ] config.set10('HAVE_@0@'.format(t[1]), t[0]) endforeachSignature · 1 line
2.16.2
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/1 meson: do not use cairo/valgrind if disabled
-Dcairo-tests=false currently results into enabling cairo support if it was found. Same for valgrind.
v2:
* Use underscore-prefixed variables to not change type of variable
* Use empty array for "fake" dependency instead of real empty object
--- meson.build | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
meson.build +18 -6
@@ -32,8 +32,6 @@ pkg = import('pkgconfig') with_udev = get_option('udev') with_freedreno_kgsl = get_option('freedreno-kgsl') with_install_tests = get_option('install-test-programs') -with_cairo_tests = get_option('cairo-tests') -with_valgrind = get_option('valgrind') config = configuration_data()
@@ -226,8 +224,22 @@ endforeach dep_pciaccess = dependency('pciaccess', version : '>= 0.10', required : with_intel) dep_cunit = dependency('cunit', version : '>= 2.1', required : false) -dep_cairo = dependency('cairo', required : with_cairo_tests == 'true') -dep_valgrind = dependency('valgrind', required : with_valgrind == 'true') +_cairo_tests = get_option('cairo-tests') +if _cairo_tests != 'false' + dep_cairo = dependency('cairo', required : _cairo_tests == 'true') + with_cairo_tests = dep_cairo.found() +else + dep_cairo = [] + with_cairo_tests = false +endif +_valgrind = get_option('valgrind') +if _valgrind != 'false' + dep_valgrind = dependency('valgrind', required : with_valgrind == 'true') + with_valgrind = dep_valgrind.found() +else + dep_valgrind = [] + with_valgrind = false +endif with_man_pages = get_option('man-pages') prog_xslt = find_program('xsltproc', required : with_man_pages == 'true')
@@ -259,8 +271,8 @@ foreach t : [ [with_radeon, 'RADEON'], [with_vc4, 'VC4'], [with_vmwgfx, 'VMWGFX'], - [dep_cairo.found(), 'CAIRO'], - [dep_valgrind.found(), 'VALGRIND'], + [with_cairo_tests, 'CAIRO'], + [with_valgrind, 'VALGRIND'], ] config.set10('HAVE_@0@'.format(t[1]), t[0]) endforeach
Signature · 6 lines
2.16.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Quoted 8 lines · Eric Engestrom
Quoted 2 lines · Igor Gnatenko
-Dcairo-tests=false currently results into enabling cairo support if it was found. Same for valgrind.
Indeed, this was wrong; thanks for the fix!
Reviewed-by Eric Engestrom <[email protected]>Do you have commit access, or do you want me to push this for you?
I don't have commit access ☹
v2 sent with all your comments.
Quoted 42 lines
Quoted 12 lines
Signed-off-by Igor Gnatenko <[email protected]>--- meson.build | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)meson.build +0
-0@@ -226,8 +226,20 @@ endforeachmeson.build endforeach · line 234
Quoted 10 lines
meson.build +5
-2dep_pciaccess = dependency('pciaccess', version : '>= 0.10', required : with_intel) dep_cunit = dependency('cunit', version : '>= 2.1', required : false) -dep_cairo = dependency('cairo', required : with_cairo_tests == 'true') -dep_valgrind = dependency('valgrind', required : with_valgrind == 'true') +if with_cairo_tests != 'false' + dep_cairo = dependency('cairo', required : with_cairo_tests == 'true') + with_cairo_tests = dep_cairo.found() +else + dep_cairo = declare_dependency()Nit:
dep_cairo = []is enough; I'll change that if I'm the one to push it.meson.build endforeach · line 235
Quoted 1 line
meson.build +1
-0+ with_cairo_tests = falseWe try to avoid changing the type of a var; could you send a follow-up patch to rename the
get_option()var to_cairo_tests?(same obviously applies for the valgrind bits)
Quoted 10 lines
meson.build +8
-0+endif +if with_valgrind != 'false' + dep_valgrind = dependency('valgrind', required : with_valgrind == 'true') + with_valgrind = dep_valgrind.found() +else + dep_valgrind = declare_dependency() + with_valgrind = false +endif
Quoted 16 lines
Quoted 16 lines
with_man_pages=get_option('man-pages')
prog_xslt=find_program('xsltproc', required : with_man_pages == 'true')meson.build +2
-2@@ -259,8 +271,8 @@ foreach t : [ [with_radeon, 'RADEON'], [with_vc4, 'VC4'], [with_vmwgfx, 'VMWGFX'], - [dep_cairo.found(), 'CAIRO'], - [dep_valgrind.found(), 'VALGRIND'], + [with_cairo_tests, 'CAIRO'], + [with_valgrind, 'VALGRIND'], ] config.set10('HAVE_@0@'.format(t[1]), t[0]) endforeachSignature · 1 line
2.16.2
- --
- -Igor Gnatenko
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEhLFO09aHZVqO+CM6aVcUvRu8X0wFAlqKyFAACgkQaVcUvRu8 X0zP3xAAsa1mi9r8Oi+pdJrXy02Bm2mGSzp8IcrDGF3i0v9d9uP7o484fmYxxz0t RDu/4YpertGmR+aYiZiEeREnZ7n+GtaBb35O1leU/zz/TniEi+Qne6kQbUcUNE3z 3URS2VKmHPAivR5ctL5/DvwOaAP7sIojlDjsu3ydZafoPVw+FF/cnJaK6yItVH7T 7ZE48i434qBUJT6IsxUCy2jb7gQSCzs/G/gNxYjVxLO/h/rb52eIiPQ5XFd6Aqmt R5ptwgb4wpQERTEkvSmFTe+tsIwmSyD8o6jJRAK4U0mGV8g5+AB/7fmZmFA7nxQ4 J9Ycqd2JZ96XruBE9qSvu9gK50oVKcQyJaq2heTKkRSwq+HP82qfhtaHsC5hsrTG lg2+bzpyGStxXzt1bndYQ2u9hcPcbvDxb9mDP5wimacdmD/qmAg2LAv5OiZESgvd Zm8TWygb/bjJoLZOTdbGqdjFGmOCq3g9ZTqbjWfhv1mmc2ZENoo/fcyyCjUg4MD3 P4IP3ogAUk9H1MORhN6I5rw2ERDGaXy60z4dJwhAfHWmwsoKRbdpRmu9Y2vFQ2n9 /kysL8yG+DPsUHB6f5ZZh/r7dsJDWeIea8ZI2gEMrGOIFxSZUcypwmjxxgC5Yo2x EwRsGvw/GAKhQQX8ukgMMy878Qj7yRvf6PoMGlVqtjlmFRVXlgM= =q2az
-----END PGP SIGNATURE-----
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/1 meson: do not use cairo/valgrind if disabled
In reply to Eric Engestrom-Dcairo-tests=false currently results into enabling cairo support if it was found. Same for valgrind.
v2:
* Use underscore-prefixed variables to not change type of variable
* Use empty array for "fake" dependency instead of real empty object
v3:
* Fix typo
--- meson.build | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
meson.build +18 -6
@@ -32,8 +32,6 @@ pkg = import('pkgconfig') with_udev = get_option('udev') with_freedreno_kgsl = get_option('freedreno-kgsl') with_install_tests = get_option('install-test-programs') -with_cairo_tests = get_option('cairo-tests') -with_valgrind = get_option('valgrind') config = configuration_data()
@@ -226,8 +224,22 @@ endforeach dep_pciaccess = dependency('pciaccess', version : '>= 0.10', required : with_intel) dep_cunit = dependency('cunit', version : '>= 2.1', required : false) -dep_cairo = dependency('cairo', required : with_cairo_tests == 'true') -dep_valgrind = dependency('valgrind', required : with_valgrind == 'true') +_cairo_tests = get_option('cairo-tests') +if _cairo_tests != 'false' + dep_cairo = dependency('cairo', required : _cairo_tests == 'true') + with_cairo_tests = dep_cairo.found() +else + dep_cairo = [] + with_cairo_tests = false +endif +_valgrind = get_option('valgrind') +if _valgrind != 'false' + dep_valgrind = dependency('valgrind', required : _valgrind == 'true') + with_valgrind = dep_valgrind.found() +else + dep_valgrind = [] + with_valgrind = false +endif with_man_pages = get_option('man-pages') prog_xslt = find_program('xsltproc', required : with_man_pages == 'true')
@@ -259,8 +271,8 @@ foreach t : [ [with_radeon, 'RADEON'], [with_vc4, 'VC4'], [with_vmwgfx, 'VMWGFX'], - [dep_cairo.found(), 'CAIRO'], - [dep_valgrind.found(), 'VALGRIND'], + [with_cairo_tests, 'CAIRO'], + [with_valgrind, 'VALGRIND'], ] config.set10('HAVE_@0@'.format(t[1]), t[0]) endforeach
Signature · 6 lines
2.16.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel