29517 2009-09-19 00:24:44 -0700 [Gtk] Fix icu CFLAG for Darwin 2009-10-12 04:57:54 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk P2 Normal --- 1 jmalonzo webkit-unassigned eric oldest_to_newest 148469 0 jmalonzo 2009-09-19 00:24:44 -0700 The unicode CFLAG additions for Darwin do not work. Patch forthcoming. 148470 1 39815 jmalonzo 2009-09-19 00:27:18 -0700 Created attachment 39815 Patch v1 148963 2 39815 xan.lopez 2009-09-21 22:37:09 -0700 Comment on attachment 39815 Patch v1 >diff --git a/ChangeLog b/ChangeLog >index ea1f82c..dff1c2b 100644 >--- a/ChangeLog >+++ b/ChangeLog >@@ -1,3 +1,15 @@ >+2009-09-19 Jan Michael Alonzo <jmalonzo@webkit.org> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ [Gtk] Fix icu CFLAG for Darwin >+ https://bugs.webkit.org/show_bug.cgi?id=29517 >+ >+ Don't escape the srcdir variable. Also use $host instead of the >+ os_foo variables. >+ >+ * autotools/webkit.m4: >+ Can you explain why are you doing instead of just saying what are you doing? :) I suppose it fails in interesting ways in OSX, but it would be good to put it in the ChangeLog for reference. > 2009-09-18 Xan Lopez <xlopez@igalia.com> > > Reviewed by Gustavo Noronha and Jan Alonzo. >diff --git a/autotools/webkit.m4 b/autotools/webkit.m4 >index 92fe5db..4698fe6 100644 >--- a/autotools/webkit.m4 >+++ b/autotools/webkit.m4 >@@ -144,13 +144,16 @@ AC_MSG_RESULT([$with_unicode_backend]) > # with the WTF Unicode backend being based on GLib while text codecs and TextBreakIterator > # keep the ICU dependency. That's why we temporarily add icu headers and libs for glib config case as well. > if test "$with_unicode_backend" = "icu" -o "$with_unicode_backend" = "glib"; then >- if test "$os_darwin" = "yes"; then >- UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" >+ case "$host" in >+ *-*-darwin*) >+ UNICODE_CFLAGS="-I $srcdir/JavaScriptCore/icu -I $srcdir/WebCore/icu" I think the common practice is not to leave a space between -I and the path? > UNICODE_LIBS="-licucore" >- elif test "$os_win32" = "yes"; then >+ ;; >+ *-*-mingw*) > UNICODE_CFLAGS="" > UNICODE_LIBS="-licuin -licuuc" >- else >+ ;; >+ *) > AC_PATH_PROG(icu_config, icu-config, no) > if test "$icu_config" = "no"; then > AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.]) >@@ -161,7 +164,8 @@ if test "$with_unicode_backend" = "icu" -o "$with_unicode_backend" = "glib"; the > # See man (1) icu-config for more info. > UNICODE_CFLAGS=`$icu_config --cppflags` > UNICODE_LIBS=`$icu_config --ldflags` >- fi >+ ;; >+ esac > fi > > if test "$with_unicode_backend" = "glib"; then 149565 3 39815 eric 2009-09-23 17:27:05 -0700 Comment on attachment 39815 Patch v1 I'm not an expert, but this looks sane enough. Rubberstamp=me. 152378 4 eric 2009-10-05 11:09:28 -0700 Ping? 154026 5 jmalonzo 2009-10-12 04:57:54 -0700 (In reply to comment #4) > Ping? Thanks Eric. Landed as http://trac.webkit.org/changeset/49436. 39815 2009-09-19 00:27:18 -0700 2009-09-23 17:27:05 -0700 Patch v1 bug-29517-20090919172715.patch text/plain 1943 jmalonzo ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBlYTFmODJjLi5kZmYxYzJi IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMDktMDktMTkgIEphbiBNaWNoYWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0d0a10gRml4 IGljdSBDRkxBRyBmb3IgRGFyd2luCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yOTUxNworCisgICAgICAgIERvbid0IGVzY2FwZSB0aGUgc3JjZGlyIHZh cmlhYmxlLiBBbHNvIHVzZSAkaG9zdCBpbnN0ZWFkIG9mIHRoZQorICAgICAgICBvc19mb28gdmFy aWFibGVzLgorCisgICAgICAgICogYXV0b3Rvb2xzL3dlYmtpdC5tNDoKKwogMjAwOS0wOS0xOCAg WGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3Vz dGF2byBOb3JvbmhhIGFuZCBKYW4gQWxvbnpvLgpkaWZmIC0tZ2l0IGEvYXV0b3Rvb2xzL3dlYmtp dC5tNCBiL2F1dG90b29scy93ZWJraXQubTQKaW5kZXggOTJmZTVkYi4uNDY5OGZlNiAxMDA2NDQK LS0tIGEvYXV0b3Rvb2xzL3dlYmtpdC5tNAorKysgYi9hdXRvdG9vbHMvd2Via2l0Lm00CkBAIC0x NDQsMTMgKzE0NCwxNiBAQCBBQ19NU0dfUkVTVUxUKFskd2l0aF91bmljb2RlX2JhY2tlbmRdKQog IyB3aXRoIHRoZSBXVEYgVW5pY29kZSBiYWNrZW5kIGJlaW5nIGJhc2VkIG9uIEdMaWIgd2hpbGUg dGV4dCBjb2RlY3MgYW5kIFRleHRCcmVha0l0ZXJhdG9yCiAjIGtlZXAgdGhlIElDVSBkZXBlbmRl bmN5LiBUaGF0J3Mgd2h5IHdlIHRlbXBvcmFyaWx5IGFkZCBpY3UgaGVhZGVycyBhbmQgbGlicyBm b3IgZ2xpYiBjb25maWcgY2FzZSBhcyB3ZWxsLgogaWYgdGVzdCAiJHdpdGhfdW5pY29kZV9iYWNr ZW5kIiA9ICJpY3UiIC1vICIkd2l0aF91bmljb2RlX2JhY2tlbmQiID0gImdsaWIiOyB0aGVuCi0J aWYgdGVzdCAiJG9zX2RhcndpbiIgPSAieWVzIjsgdGhlbgotCQlVTklDT0RFX0NGTEFHUz0iLUlc JChzcmNkaXIpL0phdmFTY3JpcHRDb3JlL2ljdSAtSVwkKHNyY2RpcikvV2ViQ29yZS9pY3UiCisg ICAgICAgIGNhc2UgIiRob3N0IiBpbgorICAgICAgICAgICAgKi0qLWRhcndpbiopCisJCVVOSUNP REVfQ0ZMQUdTPSItSSAkc3JjZGlyL0phdmFTY3JpcHRDb3JlL2ljdSAtSSAkc3JjZGlyL1dlYkNv cmUvaWN1IgogCQlVTklDT0RFX0xJQlM9Ii1saWN1Y29yZSIKLQllbGlmIHRlc3QgIiRvc193aW4z MiIgPSAieWVzIjsgdGhlbgorICAgICAgICAgICAgICAgIDs7CisgICAgICAgICAgICAqLSotbWlu Z3cqKQogCQlVTklDT0RFX0NGTEFHUz0iIgogCQlVTklDT0RFX0xJQlM9Ii1saWN1aW4gLWxpY3V1 YyIKLQllbHNlCisgICAgICAgICAgICAgICAgOzsKKyAgICAgICAgICAgICopCiAJCUFDX1BBVEhf UFJPRyhpY3VfY29uZmlnLCBpY3UtY29uZmlnLCBubykKIAkJaWYgdGVzdCAiJGljdV9jb25maWci ID0gIm5vIjsgdGhlbgogCQkJQUNfTVNHX0VSUk9SKFtDYW5ub3QgZmluZCBpY3UtY29uZmlnLiBU aGUgSUNVIGxpYnJhcnkgaXMgbmVlZGVkLl0pCkBAIC0xNjEsNyArMTY0LDggQEAgaWYgdGVzdCAi JHdpdGhfdW5pY29kZV9iYWNrZW5kIiA9ICJpY3UiIC1vICIkd2l0aF91bmljb2RlX2JhY2tlbmQi ID0gImdsaWIiOyB0aGUKIAkJIyBTZWUgbWFuICgxKSBpY3UtY29uZmlnIGZvciBtb3JlIGluZm8u CiAJCVVOSUNPREVfQ0ZMQUdTPWAkaWN1X2NvbmZpZyAtLWNwcGZsYWdzYAogCQlVTklDT0RFX0xJ QlM9YCRpY3VfY29uZmlnIC0tbGRmbGFnc2AKLQlmaQorICAgICAgICAgICAgICAgIDs7CisgICAg ICAgIGVzYWMKIGZpCiAKIGlmIHRlc3QgIiR3aXRoX3VuaWNvZGVfYmFja2VuZCIgPSAiZ2xpYiI7 IHRoZW4=