Summary: | REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Tomas Popela <tpopela> | ||||||||
Component: | WebKitGTK | Assignee: | Nobody <webkit-unassigned> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | berto, cgarcia, gnome, iain.lane, mcatanzaro, zan | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | Unspecified | ||||||||||
OS: | Unspecified | ||||||||||
Attachments: |
|
Description
Tomas Popela
2015-01-08 01:52:07 PST
Created attachment 244247 [details]
Proposed patch
These: endif # END TARGET_WAYLAND endif # END ENABLE_WEBKIT2 Should be: endif # END ENABLE_WEBKIT2 endif # END TARGET_WAYLAND (In reply to comment #2) > These: > > endif # END TARGET_WAYLAND > endif # END ENABLE_WEBKIT2 > > Should be: > > endif # END ENABLE_WEBKIT2 > endif # END TARGET_WAYLAND Yeah I already know about it. Created attachment 244253 [details]
Proposed patch v2
Fixed the order of endifs
Are you sure about that? In https://bugs.webkit.org/show_bug.cgi?id=126821#c18 I reported the same problem but for that build I was building with WK2 enabled. I'm building 2.4.8 with your patch to verify and will report back. Indeed, it fails ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginPackageGtk.o: In function `_ZN3WTF6VectorINS_6StringELm0ENS_15CrashOnOverflowEEaSERKS3_': /build/buildd/webkitgtk-2.4.8/build-3.0/../Source/WebCore/plugins/gtk/PluginPackageGtk.cpp:126: multiple definition of `_ZN7WebCore13PluginPackage4loadEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginPackageNone.o:/build/buildd/webkitgtk-2.4.8/build-3.0/../Source/WebCore/plugins/PluginPackageNone.cpp:37: first defined here Were you building with wayland and x11? I think you want `if !TARGET_X11' there. Created attachment 244758 [details]
Proposed patch v3
We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp just when WebKit2 is enabled and we are not building for X11.
(In reply to comment #7) > Created attachment 244758 [details] > Proposed patch v3 > > We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp just > when WebKit2 is enabled and we are not building for X11. This fixed the build for me in Debian, thanks!. Committed: <http://trac.webkit.org/changeset/182458> |