RESOLVED FIXED 140241
REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled 
https://bugs.webkit.org/show_bug.cgi?id=140241
Summary REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
Tomas Popela
Reported 2015-01-08 01:52:07 PST
Caused by http://trac.webkit.org/changeset/177885. We have to compile PluginPackageNone.cpp and PluginViewNone.cpp on when WK2 is enabled. ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginPackageGtk.o: In function `_ZNK7WebCore13PluginPackage9NPVersionEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp:199: multiple definition of `_ZNK7WebCore13PluginPackage9NPVersionEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginPackageNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginPackageNone.cpp:43: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginPackageGtk.o: In function `_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_S1_EENS_24KeyValuePairKeyExtractorIS3_EENS_10StringHashENS_7HashMapIS1_S1_S6_NS_10HashTraitsIS1_EES9_E18KeyValuePairTraitsES9_E6rehashEiPS3_': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp:126: multiple definition of `_ZN7WebCore13PluginPackage4loadEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginPackageNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginPackageNone.cpp:37: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginPackageGtk.o: In function `_ZN7WebCore13PluginPackage9fetchInfoEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp:44: multiple definition of `_ZN7WebCore13PluginPackage9fetchInfoEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginPackageNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginPackageNone.cpp:32: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView15setNPWindowRectERKNS_7IntRectE': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:472: multiple definition of `_ZN7WebCore10PluginView15setNPWindowRectERKNS_7IntRectE' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:65: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView5paintEPNS_15GraphicsContextERKNS_7IntRectE': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:176: multiple definition of `_ZN7WebCore10PluginView5paintEPNS_15GraphicsContextERKNS_7IntRectE' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:49: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView16setParentVisibleEb': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:579: multiple definition of `_ZN7WebCore10PluginView16setParentVisibleEb' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:113: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView18handlePostReadFileERN3WTF6VectorIcLj0ENS1_15CrashOnOverflowEEEjPKc': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:594: multiple definition of `_ZN7WebCore10PluginView18handlePostReadFileERN3WTF6VectorIcLj0ENS1_15CrashOnOverflowEEEjPKc' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:70: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView22platformGetValueStaticE11NPNVariablePvPs': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:625: multiple definition of `_ZN7WebCore10PluginView22platformGetValueStaticE11NPNVariablePvPs' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:80: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView14invalidateRectERKNS_7IntRectE': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:690: multiple definition of `_ZN7WebCore10PluginView14invalidateRectERKNS_7IntRectE' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:90: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView14invalidateRectEP7_NPRect': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:700: multiple definition of `_ZN7WebCore10PluginView14invalidateRectEP7_NPRect' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:85: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView16invalidateRegionEP8_XRegion': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:711: multiple definition of `_ZN7WebCore10PluginView16invalidateRegionEP8_XRegion' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:95: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView15platformDestroyEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:882: multiple definition of `_ZN7WebCore10PluginView15platformDestroyEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:109: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView18updatePluginWidgetEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:121: multiple definition of `_ZN7WebCore10PluginView18updatePluginWidgetEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:117: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView19handleKeyboardEventEPNS_13KeyboardEventE': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:266: multiple definition of `_ZN7WebCore10PluginView19handleKeyboardEventEPNS_13KeyboardEventE' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:53: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView18handleFocusInEventEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:432: multiple definition of `_ZN7WebCore10PluginView18handleFocusInEventEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:122: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView19handleFocusOutEventEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:448: multiple definition of `_ZN7WebCore10PluginView19handleFocusOutEventEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:126: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView16handleMouseEventEPNS_10MouseEventE': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:392: multiple definition of `_ZN7WebCore10PluginView16handleMouseEventEPNS_10MouseEventE' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:57: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView16platformGetValueE11NPNVariablePvPs': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:653: multiple definition of `_ZN7WebCore10PluginView16platformGetValueE11NPNVariablePvPs' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:75: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView11forceRedrawEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:717: multiple definition of `_ZN7WebCore10PluginView11forceRedrawEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:100: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView8setFocusEb': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:156: multiple definition of `GNUmakefile:40291: recipe for target 'libwebkitgtk-3.0.la' failed make[1]: Leaving directory '/builddir/build/BUILD/webkitgtk-2.4.8' _ZN7WebCore10PluginView8setFocusEb' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:37: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView4showEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:164: multiple definition of `_ZN7WebCore10PluginView4showEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:41: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView13platformStartEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:786: multiple definition of `_ZN7WebCore10PluginView13platformStartEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:104: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView4hideEv': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:170: multiple definition of `_ZN7WebCore10PluginView4hideEv' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:45: first defined here ./.libs/../Source/WebCore/plugins/gtk/.libs/libWebCoreGtk_la-PluginViewGtk.o: In function `_ZN7WebCore10PluginView9setParentEPNS_10ScrollViewE': /builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp:464: multiple definition of `_ZN7WebCore10PluginView9setParentEPNS_10ScrollViewE' ./.libs/../Source/WebCore/plugins/.libs/libWebCore_la-PluginViewNone.o:/builddir/build/BUILD/webkitgtk-2.4.8/Source/WebCore/plugins/PluginViewNone.cpp:61: first defined here collect2: error: ld returned 1 exit status make[1]: *** [libwebkitgtk-3.0.la] Error 1 GNUmakefile:25671: recipe for target 'all' failed make: *** [all] Error 2
Attachments
Proposed patch (2.16 KB, patch)
2015-01-08 01:59 PST, Tomas Popela 		no flags
DetailsFormatted DiffDiff
Proposed patch v2 (2.13 KB, patch)
2015-01-08 05:02 PST, Tomas Popela 		no flags
DetailsFormatted DiffDiff
Proposed patch v3 (2.32 KB, patch)
2015-01-16 03:32 PST, Tomas Popela 		cgarcia: review+
cgarcia: commit-queue-
DetailsFormatted DiffDiff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.
Tomas Popela
Comment 1 2015-01-08 01:59:23 PST
Created attachment 244247 [details] Proposed patch
Michael Catanzaro
Comment 2 2015-01-08 04:30:58 PST
These: endif # END TARGET_WAYLAND endif # END ENABLE_WEBKIT2 Should be: endif # END ENABLE_WEBKIT2 endif # END TARGET_WAYLAND
Tomas Popela
Comment 3 2015-01-08 04:35:56 PST
(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.
Tomas Popela
Comment 4 2015-01-08 05:02:08 PST
Created attachment 244253 [details] Proposed patch v2 Fixed the order of endifs
Iain Lane
Comment 5 2015-01-15 03:16:26 PST
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.
Iain Lane
Comment 6 2015-01-15 06:24:28 PST
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.
Tomas Popela
Comment 7 2015-01-16 03:32:53 PST
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.
Alberto Garcia
Comment 8 2015-01-17 08:08:02 PST
(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!.
Carlos Garcia Campos
Comment 9 2015-04-07 03:09:15 PDT
Committed: <http://trac.webkit.org/changeset/182458>
Note You need to log in before you can comment on or make changes to this bug.