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 753190 - Support <cmakeargs> tag for cmake module and fix webkit build without wayland
Support <cmakeargs> tag for cmake module and fix webkit build without wayland
Status: RESOLVED FIXED
Product: jhbuild
Classification: Infrastructure
Component: general
unspecified
Other FreeBSD
: Normal normal
: ---
Assigned To: Jhbuild maintainers
Jhbuild QA
Depends on:
Blocks:
 
 
Reported: 2015-08-03 16:09 UTC by Ting-Wei Lan
Modified: 2015-08-10 07:51 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Add a missing comma (682 bytes, patch)
2015-08-03 16:13 UTC, Ting-Wei Lan 		committed Details | Review
cmake: collect args from cmakeargs and makeargs tags (3.41 KB, patch)
2015-08-03 16:16 UTC, Ting-Wei Lan 		committed Details | Review
core-deps: Use cmakeargs instead of autogenargs in WebKit (1.27 KB, patch)
2015-08-03 16:16 UTC, Ting-Wei Lan 		committed Details | Review

Description Ting-Wei Lan 2015-08-03 16:09:49 UTC 
Commit 869e16b tried to make X11 and Wayland dependencies optional in WebKit, but it doesn't work because only autotools module supports conditionally adding autogenargs.

I will upload patches to add conditional cmakeargs support for cmake module and fix WebKit build without Wayland.
Comment 1 Ting-Wei Lan 2015-08-03 16:13:42 UTC 
Created attachment 308687 [details] [review]
Add a missing comma

This patch is not directly related to the problem, but it was found during
fixing this bug ...
Comment 2 Ting-Wei Lan 2015-08-03 16:16:18 UTC 
Created attachment 308688 [details] [review]
cmake: collect args from cmakeargs and makeargs tags

This patch reuses collect_args function from autotools.py. Do you think it is
acceptable to import autotools.py code from cmake.py? Or we should move the
function to __init__.py?
Comment 3 Ting-Wei Lan 2015-08-03 16:16:28 UTC 
Created attachment 308689 [details] [review]
core-deps: Use cmakeargs instead of autogenargs in WebKit

This makes what commit 869e16b wants to do work.
Comment 4 Frederic Peters 2015-08-10 07:44:55 UTC 
Thanks, go and push it.
Comment 5 Ting-Wei Lan 2015-08-10 07:51:18 UTC 
Attachment 308687 [details] pushed as 67d61e4 - Add a missing comma
Attachment 308688 [details] pushed as ae68cb8 - cmake: collect args from cmakeargs and makeargs tags
Attachment 308689 [details] pushed as 8eb8008 - core-deps: Use cmakeargs instead of autogenargs in WebKit