Meson: p11_system_config_modules instead of p11_package_config_modules #377
Conversation
| @@ -307,7 +307,7 @@ p11_kit_pc_variables = [ | |||
| 'p11_module_configs=@0@'.format(prefix / p11_package_config_modules), | |||
| 'p11_module_path=@0@'.format(prefix / p11_module_path), | |||
| 'proxy_module=@0@/p11-kit-proxy.so'.format(prefix / libdir), | |||
| 'p11_system_config_modules=@0@'.format(prefix / p11_package_config_modules) | |||
| 'p11_system_config_modules=@0@'.format(prefix / p11_system_config_modules) | |||
There was a problem hiding this comment.
Was this really intended? It changes the value of p11_system_config_modules from what it is in the Autotools build Specifically:
-p11_system_config_modules=/usr/share/p11-kit/modules
+p11_system_config_modules=/etc/pkcs11/modules
I noticed this because of a breakage in Fedora's gnome-keyring build. We were using the previous value with the Autotools build and then with Meson.
Feel free to ignore me if this was really intended, and please accept my apologies in that case.
There was a problem hiding this comment.
Or is it possible that gnome-keyring is using the wrong path? I am asking because /etc seems like something for system administrators, while /usr/share is better suited for files fully controlled by the operating system.
There was a problem hiding this comment.
@debarshiray thanks for looking into it! Yeah indeed this is a backward incompatible change, though I would suggest that applications switch to using p11_module_configs instead of p11_system_config_modules. I'll revert this change for now with a similar comment we have in Autotools .pc template.
For compatibility reasons, we keep p11_system_config_modules pointing to p11_package_config_modules in the pkg-config file. Spotted by Debarshi Ray in: p11-glue#377 (review) Signed-off-by: Daiki Ueno <ueno@gnu.org>
For compatibility reasons, we keep p11_system_config_modules pointing to p11_package_config_modules in the pkg-config file. Spotted by Debarshi Ray in: #377 (review) Signed-off-by: Daiki Ueno <ueno@gnu.org>
A trivial typo.