Bug 87096 – Use PluginDataNone.cpp always when NETSCAPE_PLUGIN_API is OFF

• Component: Plug-ins
• Status: RESOLVED FIXED

[Sudarsana Nagineni (babu)]

I'm getting the following build error when PLATFORM_STRATEGIES is ON and NETSCAPE_PLUGIN_API is OFF. The reason for this is PluginDataNone.cpp is included in platform specific build system(e.g. PlatformEfl.cmake) in case of NETSCAPE_PLUGIN_API is OFF. We can fix this by adding an extra check in PluginData.cpp to use empty functions in PluginDataNone.cpp when NETSCAPE_PLUGIN_API is OFF.

^[[B/usr/bin/ld.gold.real: error: CMakeFiles/webcore_efl.dir/plugins/PluginDataNone.cpp.o: multiple definition of 'WebCore::PluginData::initPlugins(WebCore::Page const*)'
/usr/bin/ld.gold.real: CMakeFiles/webcore_efl.dir/plugins/PluginData.cpp.o: previous definition here
/usr/bin/ld.gold.real: error: CMakeFiles/webcore_efl.dir/plugins/PluginDataNone.cpp.o: multiple definition of 'WebCore::PluginData::refresh()'
/usr/bin/ld.gold.real: CMakeFiles/webcore_efl.dir/plugins/PluginData.cpp.o: previous definition here
collect2: ld returned 1 exit status

[Sudarsana Nagineni (babu)]

Created attachment 143266 [details]
Patch

Fix build error by adding an extra check in PluginData.cpp

[Sudarsana Nagineni (babu)]

Anders, could you please review this patch?

[WebKit Review Bot]

Comment on attachment 143266 [details]
Patch

Clearing flags on attachment: 143266

Committed r118197: <http://trac.webkit.org/changeset/118197>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Csaba Osztrogonác]

This buildfix broke the Qt minimal build :)

/usr/bin/gold: /ramdisk/qt-linux-release-minimal/build/WebKitBuild/Release/Source/WebCore/release/libWebCore.a(PluginData.o): in function WebCore::PluginData::PluginData(WebCore::Page const*):PluginData.cpp(.text._ZN7WebCore10PluginDataC1EPKNS_4PageE+0x6d): error: undefined reference to 'WebCore::PluginData::initPlugins(WebCore::Page const*)'
/usr/bin/gold: /ramdisk/qt-linux-release-minimal/build/WebKitBuild/Release/Source/WebCore/release/libWebCore.a(PluginData.o): in function WebCore::PluginData::PluginData(WebCore::Page const*):PluginData.cpp(.text._ZN7WebCore10PluginDataC2EPKNS_4PageE+0x6d): error: undefined reference to 'WebCore::PluginData::initPlugins(WebCore::Page const*)'
collect2: ld returned 1 exit status

[Csaba Osztrogonác]

36    initPlugins(page);

--> This call is outside of ifdef guards, but the function is inside ... It isn't correct.

[Kristóf Kosztyó]

Committed r118335: <http://trac.webkit.org/changeset/118335>

[Kristóf Kosztyó]

I've fixed the Qt minimal build.

[Sudarsana Nagineni (babu)]

(In reply to comment #6)
> 36    initPlugins(page);
> 
> --> This call is outside of ifdef guards, but the function is inside ... It isn't correct.

Sorry for the trouble. This function is outside ifdefs in PluginDataNone.cpp, but I guess the file is not included in the qt buildsystem when NETSCAPE_PLUGIN_API flag is OFF.

[Andy Estes]

This turns out to be wrong for the OS X port when we disable NETSCAPE_PLUGIN_API. The Mac port supports non-Netscape plug-ins, so we need to call into PlatformStrategies even if Netscape plug-ins are disabled.

[Andy Estes]

It looks like PluginDataNone.cpp is no longer included in the EFL build when NETSCAPE_PLUGIN_API is off (as of <http://trac.webkit.org/changeset/119208>), so I'm not sure if this change is still needed. I'm going to have sherrifbot roll this out and see if it breaks any builds.

[Andy Estes]

I'm going to work on this in https://bugs.webkit.org/show_bug.cgi?id=88296