GNOME Bugzilla – Bug 792641
Re-add autotools requirements to meson build
Last modified: 2018-01-23 14:49:14 UTC
On Linux machines, the wacom, bluetooth and network panels should not be optional. The wacom and bluetooth panels should however not be enabled on s390 systems, which lack USB support. Other systems won't support those panels at all, so building them should not be attempted either.
Created attachment 367021 [details] [review] build: Make bluetooth, network and wacom mandatory on linux This patch makes these three panels mandatory on linux, except on s390 systems. In other platforms these are not built at all.
Review of attachment 367021 [details] [review]: Looks good, and works. Thanks!
Thanks for the patch. Attachment 367021 [details] pushed as a2b20a6 - build: Make bluetooth, network and wacom mandatory on linux
Review of attachment 367021 [details] [review]: ::: meson.build @@ +180,3 @@ + +if host_is_s390 + message('Bluetooth, Network and Wacom panels will not be built (no USB support on this platform)') The Network panel should be built on s390. @@ +183,3 @@ +endif + +enable_linux = host_is_linux and not host_is_s390 As per above, this is the wrong check.
Right; I misunderstood the requirements of this task. Let's fix that.
Bluetooth, Wacom: enabled on every Linux except s390, disabled on every non-Linux Network: enabled on every Linux, disabled on every non-Linux
Created attachment 367294 [details] [review] build: Make network mandatory on every linux Yes I also misunderstood the requirements. Hope this patch update fixes this.
Created attachment 367295 [details] [review] build: Make network mandatory on every linux Just a minor improvement by removing the `host_is_s390` variable which is unnecessary now.
Review of attachment 367295 [details] [review]: Passed code review, thanks for quickly fixing that!
This should be properly fixed now. Please reopen if the criteria is still not correct. Attachment 367295 [details] pushed as 3afdaa3 - build: Make network mandatory on every linux
Review of attachment 367295 [details] [review]: Looks good.
Guess I'm late to the party ;)