Bug 56351 - Add remaining files to WebCore.gypi
Summary: Add remaining files to WebCore.gypi
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other OS X 10.5
: P2 Normal
Assignee: Adam Barth
URL:
Keywords:
Depends on:
Blocks: 55018
  Show dependency treegraph
 
Reported: 2011-03-14 18:19 PDT by Adam Barth
Modified: 2011-03-15 10:55 PDT (History)
5 users (show)

See Also:


Attachments
Patch (77.97 KB, patch)
2011-03-14 18:22 PDT, Adam Barth
dglazkov: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Adam Barth 2011-03-14 18:19:17 PDT
Add remaining files to WebCore.gypi
Comment 1 Adam Barth 2011-03-14 18:22:12 PDT
Created attachment 85751 [details]
Patch
Comment 2 Dimitri Glazkov (Google) 2011-03-14 18:26:33 PDT
Comment on attachment 85751 [details]
Patch

my rubberstamp is shiny.
Comment 3 Adam Barth 2011-03-14 18:27:37 PDT
Thanks.  I'm going to let the EWS bots chew on this for a bit.  It builds locally, but that's only half the battle.
Comment 4 Adam Barth 2011-03-14 18:40:03 PDT
OMG, it builds on the Lunix.
Comment 5 Adam Barth 2011-03-14 18:43:37 PDT
http://trac.webkit.org/changeset/81093
Comment 6 WebKit Review Bot 2011-03-14 19:13:12 PDT
http://trac.webkit.org/changeset/81093 might have broken Chromium Win Release
Comment 7 Adam Barth 2011-03-14 19:14:13 PDT
Attempted fix in http://trac.webkit.org/changeset/81096
Comment 8 Alexander Pavlov (apavlov) 2011-03-15 07:32:14 PDT
This change breaks the Chromium compilability on the Linux (dbg-shlib) builder, so I'm rolling it out for now.

The relevant log fragment:

SOLINK(target) out/Debug/obj.target/third_party/WebKit/Source/WebCore/WebCore.gyp/libwebcore_svg.so
/usr/bin/ld: error: out/Debug/obj.target/webcore_platform/third_party/WebKit/Source/WebCore/platform/text/LocalizedNumberNone.o: multiple definition of 'WebCore::parseLocalizedNumber(WTF::String const&)'
/usr/bin/ld: out/Debug/obj.target/webcore_platform/third_party/WebKit/Source/WebCore/platform/text/LocalizedNumberICU.o: previous definition here
/usr/bin/ld: error: out/Debug/obj.target/webcore_platform/third_party/WebKit/Source/WebCore/platform/text/LocalizedNumberNone.o: multiple definition of 'WebCore::formatLocalizedNumber(double)'
/usr/bin/ld: out/Debug/obj.target/webcore_platform/third_party/WebKit/Source/WebCore/platform/text/LocalizedNumberICU.o: previous definition here
/usr/bin/ld: error: out/Debug/obj.target/webcore_platform/third_party/WebKit/Source/WebCore/platform/text/TextEncodingDetectorNone.o: multiple definition of 'WebCore::detectTextEncoding(char const*, unsigned int, char const*, WebCore::TextEncoding*)'
/usr/bin/ld: out/Debug/obj.target/webcore_platform/third_party/WebKit/Source/WebCore/platform/text/TextEncodingDetectorICU.o: previous definition here
collect2: ld returned 1 exit status
make: *** [out/Debug/obj.target/third_party/WebKit/Source/WebCore/WebCore.gyp/libwebcore_platform.so] Error 1
Comment 9 Alexander Pavlov (apavlov) 2011-03-15 08:33:38 PDT
Courtesy of loislo@chromium.org, the fix was landed as http://trac.webkit.org/changeset/81134
Comment 10 Adam Barth 2011-03-15 10:55:56 PDT
(In reply to comment #9)
> Courtesy of loislo@chromium.org, the fix was landed as http://trac.webkit.org/changeset/81134

Thanks for the fix!  Sorry I don't have a good way to test the dbg-shlib build.  :(