56155 2011-03-10 17:17:39 -0800 [EFL] Fix build break when SHARED_CORE is ON 2011-03-11 01:45:10 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim webkit-unassigned commit-queue oldest_to_newest 365687 0 gyuyoung.kim 2011-03-10 17:17:39 -0800 There is a build break when SHARED_CORE is ON as below, MakeFiles/webcore_efl.dir/platform/efl/ContextMenuEfl.cpp.o: In function `WebCore::ContextMenu::ContextMenu()': ContextMenuEfl.cpp:(.text+0x0): multiple definition of `WebCore::ContextMenu::ContextMenu()' CMakeFiles/webcore_efl.dir/platform/ContextMenu.cpp.o:ContextMenu.cpp:(.text+0x0): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuEfl.cpp.o: In function `WebCore::ContextMenu::ContextMenu()': ContextMenuEfl.cpp:(.text+0x20): multiple definition of `WebCore::ContextMenu::ContextMenu()' CMakeFiles/webcore_efl.dir/platform/ContextMenu.cpp.o:ContextMenu.cpp:(.text+0x20): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::ContextMenuItem(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, WTF::String const&, WebCore::ContextMenu*)': ContextMenuItemEfl.cpp:(.text+0x60): multiple definition of `WebCore::ContextMenuItem::ContextMenuItem(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, WTF::String const&, WebCore::ContextMenu*)' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0x480): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::ContextMenuItem(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, WTF::String const&, WebCore::ContextMenu*)': ContextMenuItemEfl.cpp:(.text+0x90): multiple definition of `WebCore::ContextMenuItem::ContextMenuItem(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, WTF::String const&, WebCore::ContextMenu*)' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0x410): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::type() const': ContextMenuItemEfl.cpp:(.text+0xd0): multiple definition of `WebCore::ContextMenuItem::type() const' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0xb0): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::setAction(WebCore::ContextMenuAction)': ContextMenuItemEfl.cpp:(.text+0xe0): multiple definition of `WebCore::ContextMenuItem::setAction(WebCore::ContextMenuAction)' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0xc0): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::action() const': ContextMenuItemEfl.cpp:(.text+0xf0): multiple definition of `WebCore::ContextMenuItem::action() const' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0xd0): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::setChecked(bool)': ContextMenuItemEfl.cpp:(.text+0x100): multiple definition of `WebCore::ContextMenuItem::setChecked(bool)' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0xe0): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::checked() const': ContextMenuItemEfl.cpp:(.text+0x110): multiple definition of `WebCore::ContextMenuItem::checked() const' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0xf0): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::setEnabled(bool)': ContextMenuItemEfl.cpp:(.text+0x120): multiple definition of `WebCore::ContextMenuItem::setEnabled(bool)' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0x100): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::enabled() const': ContextMenuItemEfl.cpp:(.text+0x130): multiple definition of `WebCore::ContextMenuItem::enabled() const' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0x110): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::setSubMenu(WebCore::ContextMenu*)': ContextMenuItemEfl.cpp:(.text+0x140): multiple definition of `WebCore::ContextMenuItem::setSubMenu(WebCore::ContextMenu*)' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0x360): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::~ContextMenuItem()': ContextMenuItemEfl.cpp:(.text+0x150): multiple definition of `WebCore::ContextMenuItem::~ContextMenuItem()' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0x120): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::~ContextMenuItem()': ContextMenuItemEfl.cpp:(.text+0x200): multiple definition of `WebCore::ContextMenuItem::~ContextMenuItem()' CMakeFiles/webcore_efl.dir/platform/ContextMenuItem.cpp.o:ContextMenuItem.cpp:(.text+0x1d0): first defined here collect2: ld returned 1 exit status make[2]: *** [WebCore/libwebcore_efl.so.0.1.0] Error 1 make[1]: *** [WebCore/CMakeFiles/webcore_efl.dir/all] Error 2 365693 1 85412 gyuyoung.kim 2011-03-10 17:32:09 -0800 Created attachment 85412 Patch 365886 2 85412 commit-queue 2011-03-11 01:45:07 -0800 Comment on attachment 85412 Patch Clearing flags on attachment: 85412 Committed r80833: <http://trac.webkit.org/changeset/80833> 365887 3 commit-queue 2011-03-11 01:45:10 -0800 All reviewed patches have been landed. Closing bug. 85412 2011-03-10 17:32:09 -0800 2011-03-11 01:45:07 -0800 Patch patch-sharedon.txt text/plain 3618 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZDllNWFlLi5mNmY3MmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTEtMDMtMTAgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4K IAorICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGVycm9yIGZpeC4KKworICAgICAgICBbRUZMXSBG aXggYnVpbGQgYnJlYWsgd2hlbiBTSEFSRURfQ09SRSBpcyBPTgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYxNTUKKworICAgICAgICAqIHBsYXRmb3Jt L2VmbC9Db250ZXh0TWVudUVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudTo6 Q29udGV4dE1lbnUpOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9Db250ZXh0TWVudUl0ZW1FZmwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtOjpuYXRpdmVNZW51SXRlbSk6 CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06OkNvbnRleHRNZW51SXRlbSk6Cisg ICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06On5Db250ZXh0TWVudUl0ZW0pOgorCisy MDExLTAzLTEwICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKICAg ICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCiAKICAgICAgICAgW0VGTF0gRml4IGJ1aWxkIGJy ZWFrIHdoZW4gQ1JPU1NfUExBVEZPUk1fQ09OVEVYVF9NRU5VUyBpcyBkaXNhYmxlZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9Db250ZXh0TWVudUVmbC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvQ29udGV4dE1lbnVFZmwuY3BwCmluZGV4IGZjNTc5 OWQuLjQ1ZDE3NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9Db250 ZXh0TWVudUVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0NvbnRleHRN ZW51RWZsLmNwcApAQCAtMiw3ICsyLDcgQEAKICAqICBDb3B5cmlnaHQgKEMpIDIwMDcgSG9sZ2Vy IEhhbnMgUGV0ZXIgRnJleXRoZXIKICAqICBDb3B5cmlnaHQgKEMpIDIwMDggSU5kVCAtIEluc3Rp dHV0byBOb2tpYSBkZSBUZWNub2xvZ2lhCiAgKiAgQ29weXJpZ2h0IChDKSAyMDA5LTIwMTAgUHJv RlVTSU9OIGVtYmVkZGVkIHN5c3RlbXMKLSAqICBDb3B5cmlnaHQgKEMpIDIwMDktMjAxMCBTYW1z dW5nIEVsZWN0cm9uaWNzCisgKiAgQ29weXJpZ2h0IChDKSAyMDExIFNhbXN1bmcgRWxlY3Ryb25p Y3MKICAqCiAgKiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0 cmlidXRlIGl0IGFuZC9vcgogICogIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdO VSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAgLTI2LDE5ICsyNiwxMiBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKKyNpZiBVU0UoQ1JPU1NfUExBVEZPUk1fQ09OVEVYVF9NRU5VUykKIENvbnRl eHRNZW51OjpDb250ZXh0TWVudSh2b2lkKiBtZW51KQogewotI2lmIFVTRShDUk9TU19QTEFURk9S TV9DT05URVhUX01FTlVTKQogICAgIGdldENvbnRleHRNZW51SXRlbXMobWVudSwgbV9pdGVtcyk7 Ci0jZW5kaWYKIH0KIAotQ29udGV4dE1lbnU6OkNvbnRleHRNZW51KCkKLXsKLSAgICBub3RJbXBs ZW1lbnRlZCgpOwotfQotCi0jaWYgVVNFKENST1NTX1BMQVRGT1JNX0NPTlRFWFRfTUVOVVMpCiB2 b2lkIENvbnRleHRNZW51OjpnZXRDb250ZXh0TWVudUl0ZW1zKHZvaWQqIG1lbnUsIFZlY3RvcjxD b250ZXh0TWVudUl0ZW0+JiBpdGVtcykKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwpAQCAtNTQs NiArNDcsMTEgQEAgdm9pZCogQ29udGV4dE1lbnU6Om5hdGl2ZU1lbnUoKSBjb25zdAogewogICAg IHJldHVybiBjcmVhdGVOYXRpdmVNZW51RnJvbUl0ZW1zKG1faXRlbXMpOwogfQorI2Vsc2UKK0Nv bnRleHRNZW51OjpDb250ZXh0TWVudSgpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKK30KICNl bmRpZgogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvQ29udGV4 dE1lbnVJdGVtRWZsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9Db250ZXh0TWVu dUl0ZW1FZmwuY3BwCmluZGV4IDQ4YWMyNTMuLjQyNWM2YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2VmbC9Db250ZXh0TWVudUl0ZW1FZmwuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2VmbC9Db250ZXh0TWVudUl0ZW1FZmwuY3BwCkBAIC0zLDcgKzMsNyBA QAogICogQ29weXJpZ2h0IChDKSAyMDA3IFN0YWlrb3MgQ29tcHV0aW5nIFNlcnZpY2VzIEluYy4g PGluZm9Ac3RhaWtvcy5uZXQ+CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggSU5kVCAtIEluc3RpdHV0 byBOb2tpYSBkZSBUZWNub2xvZ2lhCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDktMjAxMCBQcm9GVVNJ T04gZW1iZWRkZWQgc3lzdGVtcwotICogQ29weXJpZ2h0IChDKSAyMDA5LTIwMTAgU2Ftc3VuZyBF bGVjdHJvbmljcworICogQ29weXJpZ2h0IChDKSAyMDExIFNhbXN1bmcgRWxlY3Ryb25pY3MKICAq CiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzQsMjMgKzM0LDIyIEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAotQ29udGV4dE1lbnVJdGVtOjpDb250ZXh0TWVudUl0ZW0oQ29udGV4 dE1lbnVJdGVtVHlwZSwgQ29udGV4dE1lbnVBY3Rpb24sIGNvbnN0IFN0cmluZyYsIENvbnRleHRN ZW51KikKKyNpZiBVU0UoQ1JPU1NfUExBVEZPUk1fQ09OVEVYVF9NRU5VUykKK3ZvaWQqIENvbnRl eHRNZW51SXRlbTo6bmF0aXZlTWVudUl0ZW0oKSBjb25zdAogewogICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgcmV0dXJuIDA7CiB9Ci0KLUNvbnRleHRNZW51SXRlbTo6fkNvbnRleHRNZW51SXRl bSgpCisjZWxzZQorQ29udGV4dE1lbnVJdGVtOjpDb250ZXh0TWVudUl0ZW0oQ29udGV4dE1lbnVJ dGVtVHlwZSwgQ29udGV4dE1lbnVBY3Rpb24sIGNvbnN0IFN0cmluZyYsIENvbnRleHRNZW51KikK IHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi0jaWYgVVNFKENST1NTX1BMQVRGT1JNX0NP TlRFWFRfTUVOVVMpCi12b2lkKiBDb250ZXh0TWVudUl0ZW06Om5hdGl2ZU1lbnVJdGVtKCkgY29u c3QKK0NvbnRleHRNZW51SXRlbTo6fkNvbnRleHRNZW51SXRlbSgpCiB7CiAgICAgbm90SW1wbGVt ZW50ZWQoKTsKLSAgICByZXR1cm4gMDsKIH0KLSNlbmRpZgogCiBDb250ZXh0TWVudUl0ZW1UeXBl IENvbnRleHRNZW51SXRlbTo6dHlwZSgpIGNvbnN0CiB7CkBAIC05NSw1ICs5NCw1IEBAIHZvaWQg Q29udGV4dE1lbnVJdGVtOjpzZXRTdWJNZW51KENvbnRleHRNZW51KikKIHsKICAgICBub3RJbXBs ZW1lbnRlZCgpOwogfQotCisjZW5kaWYKIH0K