After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 795233 - Minor meson improvements
Minor meson improvements
Status: RESOLVED FIXED
Product: libsoup
Classification: Core
Component: Misc
unspecified
Other Linux
: Normal normal
: ---
Assigned To: libsoup-maint@gnome.bugs
libsoup-maint@gnome.bugs
Depends on:
Blocks:
 
 
Reported: 2018-04-13 14:15 UTC by Iñigo Martínez
Modified: 2018-04-16 05:46 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
meson: Fix introspection variable (1.05 KB, patch)
2018-04-13 14:17 UTC, Iñigo Martínez
committed Details | Review
meson: Bump meson version (794 bytes, patch)
2018-04-13 14:18 UTC, Iñigo Martínez
committed Details | Review
meson: Define check_gio_tls_src conditionally (1.32 KB, patch)
2018-04-13 14:19 UTC, Iñigo Martínez
committed Details | Review
meson: Avoid a conditional expression when checking cURL (957 bytes, patch)
2018-04-13 14:19 UTC, Iñigo Martínez
committed Details | Review
meson: Avoid a conditional expression when checking Apache (1.21 KB, patch)
2018-04-13 14:20 UTC, Iñigo Martínez
committed Details | Review
meson: Take advantage of short-circuit evaluation (1.31 KB, patch)
2018-04-13 14:21 UTC, Iñigo Martínez
committed Details | Review
meson: Avoid getting krb5_config option value early (1.32 KB, patch)
2018-04-13 14:23 UTC, Iñigo Martínez
committed Details | Review

Description Iñigo Martínez 2018-04-13 14:15:59 UTC
A set of minor improvements to the meson port.
Comment 1 Iñigo Martínez 2018-04-13 14:17:49 UTC
Created attachment 370888 [details] [review]
meson: Fix introspection variable

When VAPI support is enabled, meson checks that introspection is enabled. This is done by checking `enable_gir` variable. However, introspection support is set in the `enable_introspection` variable.
Comment 2 Iñigo Martínez 2018-04-13 14:18:24 UTC
Created attachment 370889 [details] [review]
meson: Bump meson version

The `get_supported_arguments` helper function was added in meson 0.43, so bump meson's minimum version to 0.43.
Comment 3 Iñigo Martínez 2018-04-13 14:19:11 UTC
Created attachment 370890 [details] [review]
meson: Define check_gio_tls_src conditionally

The `check_gio_tls_src` which contains the source code to test if the backend has TLs support should only be defined if `tls_check` is enabled.
Comment 4 Iñigo Martínez 2018-04-13 14:19:55 UTC
Created attachment 370891 [details] [review]
meson: Avoid a conditional expression when checking cURL

The `HAVE_CURL` definition in the `config.h` file can use the conditional expression directly without a previous evaluation.
Comment 5 Iñigo Martínez 2018-04-13 14:20:36 UTC
Created attachment 370892 [details] [review]
meson: Avoid a conditional expression when checking Apache

The conditional expression to set the value of `have_apache` is checked separately. However, it can be reduced to assign the value of the evaluation directly.
Comment 6 Iñigo Martínez 2018-04-13 14:21:13 UTC
Created attachment 370893 [details] [review]
meson: Take advantage of short-circuit evaluation

Both `enable_gnome` and `enable_introspection` can take advantage of short-circuit evaluation to reduce meson parsing.
Comment 7 Iñigo Martínez 2018-04-13 14:23:13 UTC
Created attachment 370894 [details] [review]
meson: Avoid getting krb5_config option value early

If GSSAPI is enabled and libsoup is not built using Microsoft compiler Kerberos can be used. Then the `krb5-config` binary is used. Until then is not necessary to check the `krb5_config` option.
Comment 8 Claudio Saavedra 2018-04-13 15:12:19 UTC
All yours :)
Comment 9 Tomas Popela 2018-04-16 04:53:20 UTC
Review of attachment 370888 [details] [review]:

Good catch!
Comment 10 Tomas Popela 2018-04-16 04:54:10 UTC
Review of attachment 370889 [details] [review]:

LGTM
Comment 11 Tomas Popela 2018-04-16 04:55:11 UTC
Review of attachment 370890 [details] [review]:

Makes sense. Thanks!
Comment 12 Tomas Popela 2018-04-16 04:56:02 UTC
Review of attachment 370891 [details] [review]:

LGTM
Comment 13 Tomas Popela 2018-04-16 05:01:50 UTC
Review of attachment 370892 [details] [review]:

LGTM
Comment 14 Tomas Popela 2018-04-16 05:02:25 UTC
Review of attachment 370893 [details] [review]:

Nice!
Comment 15 Tomas Popela 2018-04-16 05:03:09 UTC
Review of attachment 370893 [details] [review]:

Correct the review status..
Comment 16 Tomas Popela 2018-04-16 05:04:22 UTC
Review of attachment 370894 [details] [review]:

Makes sense
Comment 17 Tomas Popela 2018-04-16 05:05:04 UTC
Thank you Iñigo for your Meson patches!
Comment 18 Iñigo Martínez 2018-04-16 05:45:18 UTC
attachment 370888 [details] [review] pushed as 3ac2959b - meson: Fix introspection variable
attachment 370889 [details] [review] pushed as a1626e8e - meson: Bump meson version
attachment 370890 [details] [review] pushed as 31a332fb - meson: Define check_gio_tls_src conditionally
attachment 370891 [details] [review] pushed as a1a42371 - meson: Avoid a conditional expression when checking cURL
attachment 370892 [details] [review] pushed as 3ea5ea75 - meson: Avoid a conditional expression when checking Apache
attachment 370893 [details] [review] pushed as 46e17ef7 - meson: Take advantage of short-circuit evaluation
attachment 370894 [details] [review] pushed as d6116d09 - meson: Avoid getting krb5_config option value early

Thank you for your review Tomas!