121356 2013-09-14 08:07:54 -0700 [GTK] WebKitGTK+ is linking against libxslt in too many places 2013-09-14 09:11:36 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 berto berto calvaris cgarcia commit-queue gustavo mrobinson zan oldest_to_newest 929227 0 berto 2013-09-14 08:07:54 -0700 This is a follow-up to bug 119688. We're linking against libxslt in too many places. As far as I can see, libxslt is only used in a few files inside WebCore ( Source/WebCore/xml/XSL*.cpp ) so: - LIBXSLT_CFLAGS is only needed for those files (listed in webcore_sources, defined in Source/WebCore/GNUmakefile.list.am). - LIBXSLT_LIBS is only needed in the libraries that include webcore, that is: libwebkitgtk, libwebkit2gtk and webkitpluginprocess. We can remove LIBXSLT_CFLAGS from the following places, because they don't include any of the source files that use libxslt: - libWebCorePlatform_la_CPPFLAGS - libWebCoreGtk_la_CPPFLAGS - libwebkitgtk_<version>_la_CPPFLAGS - libWebCoreGtk2_la_CPPFLAGS. And we can remove LIBXSLT_LIBS from the following places, which don't need to link against libxslt. - webkit_tests_ldadd - Programs_MiniBrowser_LDADD - Programs_TestWebKitAPI_TestWebCore_LDADD - Programs_WebKitTestRunner_LDADD 929228 1 211647 berto 2013-09-14 08:16:35 -0700 Created attachment 211647 Patch Here's the patch, I built r155767 from scratch twice, release and debug builds, and everything seems to work fine. 929231 2 berto 2013-09-14 08:18:43 -0700 I'm using the gold linker btw. 929234 3 211647 mrobinson 2013-09-14 08:50:56 -0700 Comment on attachment 211647 Patch Thanks. 929239 4 berto 2013-09-14 09:11:36 -0700 Committed r155768: <http://trac.webkit.org/changeset/155768> 211647 2013-09-14 08:16:35 -0700 2013-09-14 08:50:55 -0700 Patch 121356.diff text/plain 5527 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YTI5YTExLi41ZDJmYmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTMtMDktMTQgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBXZWJLaXRHVEsrIGlzIGxpbmtpbmcgYWdhaW5zdCBsaWJ4c2x0IGluIHRvbyBt YW55IHBsYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIxMzU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRG9uJ3QgdXNlIExJQlhTTFRfQ0ZMQUdTIHdoZW4gY29tcGlsaW5nIGxpYldlYkNvcmVQbGF0 Zm9ybSBhbmQKKyAgICAgICAgbGliV2ViQ29yZUd0aywgbm8gc291cmNlIGZpbGVzIHVzZSBsaWJ4 c2x0IHRoZXJlLgorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06CisKIDIwMTMtMDktMTQgIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIENUVEU6IFJlbmRlclNW R0Jsb2NrIHJlbmRlcmVycyBhcmUgbmV2ZXIgYW5vbnltb3VzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpp bmRleCA1YzY1NDQwLi5iOTc4OWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtl ZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpAQCAtNTM3LDcgKzUz Nyw2IEBAIGxpYldlYkNvcmVQbGF0Zm9ybV9sYV9DUFBGTEFHUyA9IFwKIAkkKExJQlNFQ1JFVF9D RkxBR1MpIFwKIAkkKExJQlNPVVBfQ0ZMQUdTKSBcCiAJJChMSUJYTUxfQ0ZMQUdTKSBcCi0JJChM SUJYU0xUX0NGTEFHUykgXAogCSQoUEFOR09fQ0ZMQUdTKSBcCiAJJChTUUxJVEUzX0NGTEFHUykg XAogCSQoVU5JQ09ERV9DRkxBR1MpIFwKQEAgLTU4NSw3ICs1ODQsNiBAQCBsaWJXZWJDb3JlR3Rr X2xhX0NQUEZMQUdTID0gXAogCSQoTElCU0VDUkVUX0NGTEFHUykgXAogCSQoTElCU09VUF9DRkxB R1MpIFwKIAkkKExJQlhNTF9DRkxBR1MpIFwKLQkkKExJQlhTTFRfQ0ZMQUdTKSBcCiAJJChTUUxJ VEUzX0NGTEFHUykgXAogCSQoVU5JQ09ERV9DRkxBR1MpIFwKIAkkKFhDT01QT1NJVEVfQ0ZMQUdT KSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNjQ4NzViNy4uNWY4MmU1MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA5LTE0ICBBbGJlcnRvIEdhcmNpYSAgPGJlcnRvQGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gV2ViS2l0R1RLKyBpcyBsaW5raW5nIGFnYWluc3Qg bGlieHNsdCBpbiB0b28gbWFueSBwbGFjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyMTM1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIERvbid0IHVzZSBMSUJYU0xUX0NGTEFHUyB3aGVuIGNvbXBpbGlu ZyBsaWJ3ZWJraXRndGssIG5vIHNvdXJjZQorICAgICAgICBmaWxlcyB1c2UgbGlieHNsdCB0aGVy ZS4KKworICAgICAgICBUaGUgd2Via2l0IHRlc3RzIGRvbid0IHVzZSBsaWJ4c2x0LCBzbyB3ZSBz aG91bGRuJ3QgbGluayBhZ2FpbnN0CisgICAgICAgIGl0LgorCisgICAgICAgICogR05VbWFrZWZp bGUuYW06CisKIDIwMTMtMDktMTMgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9y b25oYUBjb2xsYWJvcmEuY29tPgogCiAgICAgICAgIFtHVEtdIE1vdmUgdG8gdGhlIG5ldyB3ZWIg aW5zcGVjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9HTlVtYWtlZmlsZS5hbSBi L1NvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFtCmluZGV4IDAyOGQ0YjMuLmI2NzMxZDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFtCisrKyBiL1NvdXJj ZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFtCkBAIC02NCw3ICs2NCw2IEBAIGxpYndlYmtpdGd0 a19AV0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQF9AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJT SU9OQF9sYV9DUFBGCiAJJChHVEtfQ0ZMQUdTKSBcCiAJJChMSUJTT1VQX0NGTEFHUykgXAogCSQo TElCWE1MX0NGTEFHUykgXAotCSQoTElCWFNMVF9DRkxBR1MpIFwKIAkkKFNRTElURTNfQ0ZMQUdT KSBcCiAJJChVTklDT0RFX0NGTEFHUykgXAogCSQoWENPTVBPU0lURV9DRkxBR1MpIFwKQEAgLTQ0 MCw3ICs0MzksNiBAQCB3ZWJraXRfdGVzdHNfbGRhZGQgPSBcCiAJJChHVEtfTElCUykgXAogCSQo R0xJQl9MSUJTKSBcCiAJJChMSUJTT1VQX0xJQlMpIFwKLQkkKExJQlhTTFRfTElCUykgXAogCSQo WFJFTkRFUl9MSUJTKQogCiB3ZWJraXRfdGVzdHNfbGRmbGFncyA9IFwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAw MjlkOTljLi45NzZjMjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDktMTQg IEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBXZWJL aXRHVEsrIGlzIGxpbmtpbmcgYWdhaW5zdCBsaWJ4c2x0IGluIHRvbyBtYW55IHBsYWNlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxMzU2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgdXNlIExJ QlhTTFRfQ0ZMQUdTIHdoZW4gY29tcGlsaW5nIGxpYldlYkNvcmVHdGsyLCBubyBzb3VyY2UKKyAg ICAgICAgZmlsZXMgdXNlIGxpYnhzbHQgdGhlcmUuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5h bToKKwogMjAxMy0wOS0xMyAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggYXR0ZW1wdCBmb3IgV0syIGJ1aWxkLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViS2l0Mi9H TlVtYWtlZmlsZS5hbQppbmRleCA2YmE4ODRmLi5hZGM2MGMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5h bQpAQCAtNTEzLDcgKzUxMyw2IEBAIGxpYldlYkNvcmVHdGsyX2xhX0NQUEZMQUdTID0gXAogCSQo TElCU0VDUkVUX0NGTEFHUykgXAogCSQoTElCU09VUF9DRkxBR1MpIFwKIAkkKExJQlhNTF9DRkxB R1MpIFwKLQkkKExJQlhTTFRfQ0ZMQUdTKSBcCiAJJChTUUxJVEUzX0NGTEFHUykgXAogCSQoVU5J Q09ERV9DRkxBR1MpIFwKIAkkKFhSRU5ERVJfQ0ZMQUdTKSBcCmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWUzMTk4My4uZGMyYTY1NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEzLTA5LTE0ICBBbGJlcnRvIEdhcmNpYSAgPGJlcnRvQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW0dUS10gV2ViS2l0R1RLKyBpcyBsaW5raW5nIGFnYWluc3QgbGlieHNsdCBpbiB0b28g bWFueSBwbGFjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyMTM1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRlc3RXZWJDb3JlLCBXZWJLaXRUZXN0UnVubmVyIGFuZCBNaW5pQnJvd3NlciBkb24ndCB1 c2UgbGlieHNsdCwKKyAgICAgICAgc28gd2UgZG9uJ3QgbmVlZCB0byBsaW5rIGFnYWluc3QgaXQu CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvR05VbWFrZWZpbGUuYW06CisgICAgICAgICog VGVzdFdlYktpdEFQSS9HTlVtYWtlZmlsZS5hbToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVy L0dOVW1ha2VmaWxlLmFtOgorCiAyMDEzLTA5LTE0ICBSb3NzIEJ1cnRvbiAgPHJvc3MuYnVydG9u QGludGVsLmNvbT4KIAogICAgICAgICBVc2VzIGd0ay1kb2MgdG9vbHMgZXZlbiB3aGVuIC0tZGlz YWJsZS1ndGstZG9jIHBhc3NlZApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0dO VW1ha2VmaWxlLmFtIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0dOVW1ha2VmaWxlLmFtCmluZGV4 IGUzNWNhYjguLmIxYjk5NWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9HTlVt YWtlZmlsZS5hbQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvR05VbWFrZWZpbGUuYW0KQEAg LTQwLDcgKzQwLDYgQEAgUHJvZ3JhbXNfTWluaUJyb3dzZXJfTERBREQgPSBcCiAJJChGUkVFVFlQ RV9MSUJTKSBcCiAJJChHTElCX0xJQlMpIFwKIAkkKEdUS19MSUJTKSBcCi0JJChMSUJYU0xUX0xJ QlMpIFwKIAkkKExJQlNPVVBfTElCUykKIAogUHJvZ3JhbXNfTWluaUJyb3dzZXJfTERGTEFHUyA9 IFwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvR05VbWFrZWZpbGUuYW0gYi9Ub29s cy9UZXN0V2ViS2l0QVBJL0dOVW1ha2VmaWxlLmFtCmluZGV4IGM2OWRhZmMuLjNiODZiOTNjIDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL0dOVW1ha2VmaWxlLmFtCisrKyBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvR05VbWFrZWZpbGUuYW0KQEAgLTE1MCw3ICsxNTAsNiBAQCBQcm9ncmFt c19UZXN0V2ViS2l0QVBJX1Rlc3RXZWJDb3JlX0xEQUREID0gXAogCSQoTElCU0VDUkVUX0xJQlMp IFwKIAkkKExJQlNPVVBfTElCUykgXAogCSQoTElCWE1MX0xJQlMpIFwKLQkkKExJQlhTTFRfTElC UykgXAogCSQoT1BFTkdMX0xJQlMpIFwKIAkkKFBBTkdPX0xJQlMpIFwKIAkkKFBOR19MSUJTKSBc CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0dOVW1ha2VmaWxlLmFtIGIvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9HTlVtYWtlZmlsZS5hbQppbmRleCA3MGI0YWFlLi5iZDA0ZjRk IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0dOVW1ha2VmaWxlLmFtCisrKyBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvR05VbWFrZWZpbGUuYW0KQEAgLTU5LDcgKzU5LDYgQEAg UHJvZ3JhbXNfV2ViS2l0VGVzdFJ1bm5lcl9MREFERCA9IFwKIAkkKEZSRUVUWVBFX0xJQlMpIFwK IAkkKFdJTk1NX0xJQlMpIFwKIAkkKFhSRU5ERVJfTElCUykgXAotCSQoTElCWFNMVF9MSUJTKSBc CiAJJChYVF9MSUJTKQogCiBQcm9ncmFtc19XZWJLaXRUZXN0UnVubmVyX0xERkxBR1MgPSBcCg==