117168 2013-06-03 14:12:43 -0700 [GTK] Respect PKG_CONFIG env variable when generating gtk-doc 2013-06-03 15:25:19 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 erik-webkit webkit-unassigned commit-queue gustavo mrobinson zan oldest_to_newest 896607 0 erik-webkit 2013-06-03 14:12:43 -0700 The tool generate-gtkdoc internally calls pkg-config. When cross-compiling it shouldn't use pkg-config, but it should use the pkg-config which was detected by the ./configure script (for example this can be i686-w64-mingw32-pkg-config when cross-compiling) 896609 1 203627 erik-webkit 2013-06-03 14:13:29 -0700 Created attachment 203627 Proposed patch 896617 2 203627 zan 2013-06-03 14:26:45 -0700 Comment on attachment 203627 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=203627&action=review > Tools/gtk/gtkdoc.py:402 > + if os.environ.get('PKG_CONFIG'): > + pkg_config = os.environ['PKG_CONFIG'] > + else: > + pkg_config = 'pkg-config' Can be simplified into: pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') http://docs.python.org/2/library/stdtypes.html#dict.get 896622 3 203628 erik-webkit 2013-06-03 14:37:42 -0700 Created attachment 203628 Proposed patch (try2) Simplified the python code 896644 4 203628 commit-queue 2013-06-03 15:25:17 -0700 Comment on attachment 203628 Proposed patch (try2) Clearing flags on attachment: 203628 Committed r151135: <http://trac.webkit.org/changeset/151135> 896645 5 commit-queue 2013-06-03 15:25:19 -0700 All reviewed patches have been landed. Closing bug. 203627 2013-06-03 14:13:29 -0700 2013-06-03 14:37:42 -0700 Proposed patch webkitgtk-respect-PKG_CONFIG-env-variable-when-generating-gtkdoc.patch text/plain 3000 erik-webkit ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNzRm ZTM0Li5hOTNkNGYwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDYtMDMgIEVyaWsgdmFuIFBpZW5icm9layAg PGVwaWVuYnJvQGZlZG9yYXByb2plY3Qub3JnPgorCisgICAgICAgIFtHVEtdIFJlc3BlY3QgUEtH X0NPTkZJRyBlbnYgdmFyaWFibGUgd2hlbiBnZW5lcmF0aW5nIGd0ay1kb2MKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzE2OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSB0b29sIGdlbmVyYXRlLWd0 a2RvYyBpbnRlcm5hbGx5IGNhbGxzIHBrZy1jb25maWcuCisgICAgICAgIFdoZW4gY3Jvc3MtY29t cGlsaW5nIGl0IHNob3VsZG4ndCB1c2UgcGtnLWNvbmZpZywgYnV0CisgICAgICAgIGl0IHNob3Vs ZCB1c2UgdGhlIHBrZy1jb25maWcgd2hpY2ggd2FzIGRldGVjdGVkIGJ5CisgICAgICAgIHRoZSAu L2NvbmZpZ3VyZSBzY3JpcHQgKGZvciBleGFtcGxlIHRoaXMgY2FuIGJlCisgICAgICAgIGk2ODYt dzY0LW1pbmd3MzItcGtnLWNvbmZpZyB3aGVuIGNyb3NzLWNvbXBpbGluZykKKworICAgICAgICAq IEdOVW1ha2VmaWxlLmFtOgorICAgICAgICAqIGd0ay9ndGtkb2MucHk6CisgICAgICAgIChQa2dD b25maWdHVEtEb2MuX19pbml0X18pOgorCiAyMDEzLTA2LTAzICBDaHJpcyBGbGVpemFjaCAgPGNm bGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IE1hdGhNTCBtdWx0aXNjcmlwdHMgbm90 IGV4cG9zZWQgaW4gQWNjZXNzaWJpbGl0eQpkaWZmIC0tZ2l0IGEvVG9vbHMvR05VbWFrZWZpbGUu YW0gYi9Ub29scy9HTlVtYWtlZmlsZS5hbQppbmRleCBmM2Q3ZjRiLi5hYmVkNTZkIDEwMDY0NAot LS0gYS9Ub29scy9HTlVtYWtlZmlsZS5hbQorKysgYi9Ub29scy9HTlVtYWtlZmlsZS5hbQpAQCAt NDAwLDcgKzQwMCw3IEBAIGlmIEVOQUJMRV9XRUJLSVQyCiAJICBmaTsgXAogCWZpCiBlbmRpZgot CUAkKEFNX1ZfR0VOKSQoUFlUSE9OKSAkKHNyY2RpcikvVG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2Rv YyAtLXJlYmFzZSAtLXZpcnR1YWwtcm9vdD0kJHtERVNURElSfQorCUAkKEFNX1ZfR0VOKSBQS0df Q09ORklHPSQoUEtHX0NPTkZJRykgJChQWVRIT04pICQoc3JjZGlyKS9Ub29scy9ndGsvZ2VuZXJh dGUtZ3RrZG9jIC0tcmViYXNlIC0tdmlydHVhbC1yb290PSQke0RFU1RESVJ9CiAKIHVuaW5zdGFs bC1sb2NhbDoKIGlmIEVOQUJMRV9XRUJLSVQxCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvZ3RrZG9j LnB5IGIvVG9vbHMvZ3RrL2d0a2RvYy5weQppbmRleCAwY2JjY2YxLi4xZjgwNDMyIDEwMDY0NAot LS0gYS9Ub29scy9ndGsvZ3RrZG9jLnB5CisrKyBiL1Rvb2xzL2d0ay9ndGtkb2MucHkKQEAgLTM5 NiwxOSArMzk2LDI0IEBAIGNsYXNzIFBrZ0NvbmZpZ0dUS0RvYyhHVEtEb2MpOgogICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwa2dfY29uZmlnX3BhdGgsIGFyZ3MpOgogICAgICAgICBzdXBlcihQa2dD b25maWdHVEtEb2MsIHNlbGYpLl9faW5pdF9fKGFyZ3MpCiAKKyAgICAgICAgaWYgb3MuZW52aXJv bi5nZXQoJ1BLR19DT05GSUcnKToKKyAgICAgICAgICAgIHBrZ19jb25maWcgPSBvcy5lbnZpcm9u WydQS0dfQ09ORklHJ10KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHBrZ19jb25maWcgPSAn cGtnLWNvbmZpZycKKwogICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMocGtnX2NvbmZpZ19w YXRoKToKICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignQ291bGQgbm90IGZpbmQgcGtnLWNv bmZpZyBmaWxlIGF0OiAlcycKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAlIHBrZ19jb25m aWdfcGF0aCkKIAotICAgICAgICBzZWxmLmNmbGFncyArPSAiICIgKyBzZWxmLl9ydW5fY29tbWFu ZChbJ3BrZy1jb25maWcnLAorICAgICAgICBzZWxmLmNmbGFncyArPSAiICIgKyBzZWxmLl9ydW5f Y29tbWFuZChbcGtnX2NvbmZpZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHBrZ19jb25maWdfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICctLWNmbGFncyddLCBwcmludF9vdXRwdXQ9RmFsc2UpCi0g ICAgICAgIHNlbGYubGRmbGFncyArPSAiICIgKyBzZWxmLl9ydW5fY29tbWFuZChbJ3BrZy1jb25m aWcnLAorICAgICAgICBzZWxmLmxkZmxhZ3MgKz0gIiAiICsgc2VsZi5fcnVuX2NvbW1hbmQoW3Br Z19jb25maWcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBwa2dfY29uZmlnX3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnLS1saWJzJ10sIHByaW50X291dHB1dD1GYWxzZSkKLSAgICAgICAgc2VsZi52 ZXJzaW9uID0gc2VsZi5fcnVuX2NvbW1hbmQoWydwa2ctY29uZmlnJywKKyAgICAgICAgc2VsZi52 ZXJzaW9uID0gc2VsZi5fcnVuX2NvbW1hbmQoW3BrZ19jb25maWcsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBwa2dfY29uZmlnX3BhdGgsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1tb2R2ZXJzaW9uJ10sIHByaW50X291dHB1 dD1GYWxzZSkKLSAgICAgICAgc2VsZi5wcmVmaXggPSBzZWxmLl9ydW5fY29tbWFuZChbJ3BrZy1j b25maWcnLAorICAgICAgICBzZWxmLnByZWZpeCA9IHNlbGYuX3J1bl9jb21tYW5kKFtwa2dfY29u ZmlnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwa2dfY29uZmln X3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLXZhcmlh YmxlPXByZWZpeCddLCBwcmludF9vdXRwdXQ9RmFsc2UpCiAK 203628 2013-06-03 14:37:42 -0700 2013-06-03 15:25:16 -0700 Proposed patch (try2) webkitgtk-respect-PKG_CONFIG-env-variable-when-generating-gtkdoc.patch text/plain 2887 erik-webkit ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNzRm ZTM0Li5hOTNkNGYwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDYtMDMgIEVyaWsgdmFuIFBpZW5icm9layAg PGVwaWVuYnJvQGZlZG9yYXByb2plY3Qub3JnPgorCisgICAgICAgIFtHVEtdIFJlc3BlY3QgUEtH X0NPTkZJRyBlbnYgdmFyaWFibGUgd2hlbiBnZW5lcmF0aW5nIGd0ay1kb2MKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzE2OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSB0b29sIGdlbmVyYXRlLWd0 a2RvYyBpbnRlcm5hbGx5IGNhbGxzIHBrZy1jb25maWcuCisgICAgICAgIFdoZW4gY3Jvc3MtY29t cGlsaW5nIGl0IHNob3VsZG4ndCB1c2UgcGtnLWNvbmZpZywgYnV0CisgICAgICAgIGl0IHNob3Vs ZCB1c2UgdGhlIHBrZy1jb25maWcgd2hpY2ggd2FzIGRldGVjdGVkIGJ5CisgICAgICAgIHRoZSAu L2NvbmZpZ3VyZSBzY3JpcHQgKGZvciBleGFtcGxlIHRoaXMgY2FuIGJlCisgICAgICAgIGk2ODYt dzY0LW1pbmd3MzItcGtnLWNvbmZpZyB3aGVuIGNyb3NzLWNvbXBpbGluZykKKworICAgICAgICAq IEdOVW1ha2VmaWxlLmFtOgorICAgICAgICAqIGd0ay9ndGtkb2MucHk6CisgICAgICAgIChQa2dD b25maWdHVEtEb2MuX19pbml0X18pOgorCiAyMDEzLTA2LTAzICBDaHJpcyBGbGVpemFjaCAgPGNm bGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IE1hdGhNTCBtdWx0aXNjcmlwdHMgbm90 IGV4cG9zZWQgaW4gQWNjZXNzaWJpbGl0eQpkaWZmIC0tZ2l0IGEvVG9vbHMvR05VbWFrZWZpbGUu YW0gYi9Ub29scy9HTlVtYWtlZmlsZS5hbQppbmRleCBmM2Q3ZjRiLi5hYmVkNTZkIDEwMDY0NAot LS0gYS9Ub29scy9HTlVtYWtlZmlsZS5hbQorKysgYi9Ub29scy9HTlVtYWtlZmlsZS5hbQpAQCAt NDAwLDcgKzQwMCw3IEBAIGlmIEVOQUJMRV9XRUJLSVQyCiAJICBmaTsgXAogCWZpCiBlbmRpZgot CUAkKEFNX1ZfR0VOKSQoUFlUSE9OKSAkKHNyY2RpcikvVG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2Rv YyAtLXJlYmFzZSAtLXZpcnR1YWwtcm9vdD0kJHtERVNURElSfQorCUAkKEFNX1ZfR0VOKSBQS0df Q09ORklHPSQoUEtHX0NPTkZJRykgJChQWVRIT04pICQoc3JjZGlyKS9Ub29scy9ndGsvZ2VuZXJh dGUtZ3RrZG9jIC0tcmViYXNlIC0tdmlydHVhbC1yb290PSQke0RFU1RESVJ9CiAKIHVuaW5zdGFs bC1sb2NhbDoKIGlmIEVOQUJMRV9XRUJLSVQxCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvZ3RrZG9j LnB5IGIvVG9vbHMvZ3RrL2d0a2RvYy5weQppbmRleCAwY2JjY2YxLi4xZjgwNDMyIDEwMDY0NAot LS0gYS9Ub29scy9ndGsvZ3RrZG9jLnB5CisrKyBiL1Rvb2xzL2d0ay9ndGtkb2MucHkKQEAgLTM5 NiwxOSArMzk2LDIxIEBACiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBrZ19jb25maWdfcGF0aCwg YXJncyk6CiAgICAgICAgIHN1cGVyKFBrZ0NvbmZpZ0dUS0RvYywgc2VsZikuX19pbml0X18oYXJn cykKIAorICAgICAgICBwa2dfY29uZmlnID0gb3MuZW52aXJvbi5nZXQoJ1BLR19DT05GSUcnLCAn cGtnLWNvbmZpZycpCisKICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKHBrZ19jb25maWdf cGF0aCk6CiAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ0NvdWxkIG5vdCBmaW5kIHBrZy1j b25maWcgZmlsZSBhdDogJXMnCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSBwa2dfY29u ZmlnX3BhdGgpCiAKLSAgICAgICAgc2VsZi5jZmxhZ3MgKz0gIiAiICsgc2VsZi5fcnVuX2NvbW1h bmQoWydwa2ctY29uZmlnJywKKyAgICAgICAgc2VsZi5jZmxhZ3MgKz0gIiAiICsgc2VsZi5fcnVu X2NvbW1hbmQoW3BrZ19jb25maWcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwa2dfY29uZmlnX3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnLS1jZmxhZ3MnXSwgcHJpbnRfb3V0cHV0PUZhbHNlKQot ICAgICAgICBzZWxmLmxkZmxhZ3MgKz0gIiAiICsgc2VsZi5fcnVuX2NvbW1hbmQoWydwa2ctY29u ZmlnJywKKyAgICAgICAgc2VsZi5sZGZsYWdzICs9ICIgIiArIHNlbGYuX3J1bl9jb21tYW5kKFtw a2dfY29uZmlnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcGtnX2NvbmZpZ19wYXRoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJy0tbGlicyddLCBwcmludF9vdXRwdXQ9RmFsc2UpCi0gICAgICAgIHNlbGYu dmVyc2lvbiA9IHNlbGYuX3J1bl9jb21tYW5kKFsncGtnLWNvbmZpZycsCisgICAgICAgIHNlbGYu dmVyc2lvbiA9IHNlbGYuX3J1bl9jb21tYW5kKFtwa2dfY29uZmlnLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGtnX2NvbmZpZ19wYXRoLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0tbW9kdmVyc2lvbiddLCBwcmludF9vdXRw dXQ9RmFsc2UpCi0gICAgICAgIHNlbGYucHJlZml4ID0gc2VsZi5fcnVuX2NvbW1hbmQoWydwa2ct Y29uZmlnJywKKyAgICAgICAgc2VsZi5wcmVmaXggPSBzZWxmLl9ydW5fY29tbWFuZChbcGtnX2Nv bmZpZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGtnX2NvbmZp Z19wYXRoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS12YXJp YWJsZT1wcmVmaXgnXSwgcHJpbnRfb3V0cHV0PUZhbHNlKQogCg==