Summary: | [WPE] Improve include hierarchy | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Michael Catanzaro <mcatanzaro> | ||||||
Component: | WPE WebKit | Assignee: | Michael Catanzaro <mcatanzaro> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | bugs-noreply, commit-queue, mcatanzaro, zan | ||||||
Priority: | P2 | ||||||||
Version: | WebKit Nightly Build | ||||||||
Hardware: | Mac | ||||||||
OS: | Linux | ||||||||
Bug Depends on: | |||||||||
Bug Blocks: | 178894 | ||||||||
Attachments: |
|
Description
Michael Catanzaro
2018-04-06 17:48:37 PDT
(In reply to Michael Catanzaro from comment #0) > In theory, > this could cause problems if WebKitGTK+ and WPE ever get pulled into the > same include path, since the jsc headers could conflict Sorry, I wasn't thinking properly. There's no difference because wpe-0.1/WPE was already previously in the Cflags. Created attachment 337411 [details]
Patch
This will break any applications including headers as: #include <WPE/wpe/webkit.h> rather than: #include <wpe/webkit.h> Now only the later style is permitted. This kinda-sorta conflicts with https://github.com/WebPlatformForEmbedded/WPEBackend/issues/10. It should be "fine" as in no build failures, but it's going to result in the headers being installed into the same place. We should still do this, but I further suggest switching WebKit from using /usr/include/wpe-0.1 to /usr/include/wpe-webkit-0.1 to further disambiguate. Alternative schemes are possible, of course. Let's change the include path to use wpe-webkit-0.1 instead of wpe-0.1, so we can have separate API versions for WebKit and libwpe. Created attachment 337568 [details]
Patch
Comment on attachment 337568 [details] Patch Clearing flags on attachment: 337568 Committed r230576: <https://trac.webkit.org/changeset/230576> All reviewed patches have been landed. Closing bug. |