44744 2010-08-26 20:36:31 -0700 Fix Coverage build after the addition of ANGLE 2010-08-29 18:55:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zecke zecke oldest_to_newest 270292 0 65668 zecke 2010-08-26 20:36:31 -0700 Created attachment 65668 Patch ANGLE is using libtool to build a static library and the version of libtool on Leopard refuses to handle the -fprofile-arcs and -ftest-coverage parameters. The easiest way to handle this is to not build ANGLE with coverage information. This is achieved by applying the XCode options for each project separately and exclude ANGLE. * Scripts/build-webkit: Remove -framework AppKit due link errors. * Scripts/webkitdirs.pm: Do not apply the XCode options for ANGLE. --- 3 files changed, 23 insertions(+), 5 deletions(-) 271257 1 zecke 2010-08-29 18:55:24 -0700 Landed in r66346. 65668 2010-08-26 20:36:31 -0700 2010-08-29 12:05:35 -0700 Patch 20100827113622.patch text/plain 3551 zecke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1NGFmMGI1MmQyNTAyYjMyODZmMzFjYmU2MDM4MmExN2Q3ZjU0MzZlLi4zZDY2ODEy OGJjMjc1OWFjNzAzMWFkMWY0MjliMWJhZGQzODBiYzcyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTAtMDgtMjYgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8aG9sZ2VyQG1vaWppLW1v YmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRml4IENvdmVyYWdlIGJ1aWxkIGFmdGVyIHRoZSBhZGRpdGlvbiBvZiBBTkdMRQorCisgICAg ICAgIEFOR0xFIGlzIHVzaW5nIGxpYnRvb2wgdG8gYnVpbGQgYSBzdGF0aWMgbGlicmFyeSBhbmQg dGhlIHZlcnNpb24gb2YKKyAgICAgICAgbGlidG9vbCBvbiBMZW9wYXJkIHJlZnVzZXMgdG8gaGFu ZGxlIHRoZSAtZnByb2ZpbGUtYXJjcyBhbmQgLWZ0ZXN0LWNvdmVyYWdlCisgICAgICAgIHBhcmFt ZXRlcnMuIFRoZSBlYXNpZXN0IHdheSB0byBoYW5kbGUgdGhpcyBpcyB0byBub3QgYnVpbGQgQU5H TEUgd2l0aAorICAgICAgICBjb3ZlcmFnZSBpbmZvcm1hdGlvbi4KKworICAgICAgICBUaGlzIGlz IGFjaGlldmVkIGJ5IGFwcGx5aW5nIHRoZSBYQ29kZSBvcHRpb25zIGZvciBlYWNoIHByb2plY3QK KyAgICAgICAgc2VwYXJhdGVseSBhbmQgZXhjbHVkZSBBTkdMRS4KKworICAgICAgICAqIFNjcmlw dHMvYnVpbGQtd2Via2l0OiBSZW1vdmUgLWZyYW1ld29yayBBcHBLaXQgZHVlIGxpbmsgZXJyb3Jz LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbTogRG8gbm90IGFwcGx5IHRoZSBYQ29k ZSBvcHRpb25zIGZvciBBTkdMRS4KKwogMjAxMC0wOC0yNSAgSm9uIEhvbmV5Y3V0dCAgPGpob25l eWN1dHRAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MzM0MzM4PiBydW4t d2Via2l0LXRlc3RzIHNvbWV0aW1lcyBoYW5ncyB3aGVuIHVzaW5nCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQt d2Via2l0CmluZGV4IGFjZDc3MzZmNzZjNWUzNmIwNzQxN2VmM2NjZjYwMzY3YjJjZjk4ZTIuLjQy MzQ5MDVhMjkzMDQ4ZjRmYWMwZWQ5Y2I1ZGFjNmQwNzFmNzdmYjYgMTAwNzU1Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVp bGQtd2Via2l0CkBAIC0yLDYgKzIsNyBAQAogCiAjIENvcHlyaWdodCAoQykgMjAwNSwgMjAwNiBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjIENvcHlyaWdodCAoQykgMjAwOSBHb29n bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTAgbW9pamkt bW9iaWxlLmNvbSBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0zMzAsOSArMzMxLDcgQEAgaWYgKGlzR3RrKCkpIHsKICAgICB9CiAKICAgICBmb3Jl YWNoIChAZmVhdHVyZXMpIHsKLSAgICAgICAgaWYgKCRfLT57b3B0aW9ufSBlcSAiY292ZXJhZ2Ui KSB7Ci0gICAgICAgICAgICBwdXNoIEBvcHRpb25zLCBYY29kZUNvdmVyYWdlU3VwcG9ydE9wdGlv bnMoKSBpZiAkY292ZXJhZ2VTdXBwb3J0OwotICAgICAgICB9IGVsc2UgeworICAgICAgICBpZiAo JF8tPntvcHRpb259IG5lICJjb3ZlcmFnZSIpIHsKICAgICAgICAgICAgIG15ICRvcHRpb24gPSBv cHRpb24oJF8tPntkZWZpbmV9LCAkeyRfLT57dmFsdWV9fSwgJF8tPntkZWZhdWx0fSk7CiAgICAg ICAgICAgICBwdXNoIEBvcHRpb25zLCAkb3B0aW9uIHVubGVzcyAkb3B0aW9uIGVxICIiOwogICAg ICAgICB9CkBAIC00NDEsNyArNDQwLDkgQEAgZm9yIG15ICRkaXIgKEBwcm9qZWN0cykgewogICAg ICAgICAkcmVzdWx0ID0gYnVpbGRRTWFrZVF0UHJvamVjdCgkZGlyLCAkY2xlYW4sIEBvcHRpb25z KTsKICAgICB9IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgJGRpciA9ICJN aW5pQnJvd3NlciIgaWYgJGRpciBlcSAiV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIiOwotICAgICAg ICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2plY3QoJGRpciwgJGNsZWFuLCBAb3B0aW9ucywgQEFS R1YpOworICAgICAgICBteSBAbG9jYWxfb3B0aW9ucyA9IEBvcHRpb25zOworICAgICAgICBwdXNo IEBsb2NhbF9vcHRpb25zLCBYY29kZUNvdmVyYWdlU3VwcG9ydE9wdGlvbnMoKSBpZiAkY292ZXJh Z2VTdXBwb3J0ICYmICRkaXIgbmUgIkFOR0xFIjsKKyAgICAgICAgJHJlc3VsdCA9IGJ1aWxkWENv ZGVQcm9qZWN0KCRkaXIsICRjbGVhbiwgQGxvY2FsX29wdGlvbnMsIEBBUkdWKTsKICAgICB9IGVs c2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKICAgICAgICAgaWYgKCRkaXIgZXEgIldlYktpdCIp IHsKICAgICAgICAgICAgICRyZXN1bHQgPSBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QoIndpbi9X ZWJLaXQudmNwcm9qL1dlYktpdC5zbG4iLCAkY2xlYW4pOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IDM5MDE2MTFmMzNjOGJkZDU3M2RiM2YyZjFjNzk0MzgzM2ZiZDFhNzkuLmI0ZDNm NjA4ZWY0ODgxYzI1ZGVhYzk0YWE1NTIzZmQ4NjkxNTgzZTQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KQEAgLTQwMyw3ICs0MDMsNyBAQCBzdWIgWGNvZGVDb3ZlcmFnZVN1cHBvcnRPcHRp b25zKCkKICAgICBwdXNoIEBjb3ZlcmFnZVN1cHBvcnRPcHRpb25zLCAiR0NDX0lOU1RSVU1FTlRf UFJPR1JBTV9GTE9XX0FSQ1M9WUVTIjsKICAgICBwdXNoIEBjb3ZlcmFnZVN1cHBvcnRPcHRpb25z LCAiRVhUUkFfTElOSz0gXCQoRVhUUkFfTElOSykgLWZ0ZXN0LWNvdmVyYWdlIC1mcHJvZmlsZS1h cmNzIjsKICAgICBwdXNoIEBjb3ZlcmFnZVN1cHBvcnRPcHRpb25zLCAiT1RIRVJfQ0ZMQUdTPSBc JChPVEhFUl9DRkxBR1MpIC1EQ09WRVJBR0UgLU1EIjsKLSAgICBwdXNoIEBjb3ZlcmFnZVN1cHBv cnRPcHRpb25zLCAiT1RIRVJfTERGTEFHUz1cJChPVEhFUl9MREZMQUdTKSAtZnRlc3QtY292ZXJh Z2UgLWZwcm9maWxlLWFyY3MgLWZyYW1ld29yayBBcHBLaXQiOworICAgIHB1c2ggQGNvdmVyYWdl U3VwcG9ydE9wdGlvbnMsICJPVEhFUl9MREZMQUdTPVwkKE9USEVSX0xERkxBR1MpIC1mdGVzdC1j b3ZlcmFnZSAtZnByb2ZpbGUtYXJjcyAtbGdjb3YiOwogICAgIHJldHVybiBAY292ZXJhZ2VTdXBw b3J0T3B0aW9uczsKIH0KIAo=