179252 2017-11-03 11:49:56 -0700 [GTK] Fix gtk-doc generation with gtk-doc master 2017-11-04 09:47:51 -0700 1 1 1 Unclassified WebKit WebKitGTK Other PC Linux RESOLVED FIXED https://bugzilla.gnome.org/show_bug.cgi?id=789800 P2 Normal --- 1 mcatanzaro mcatanzaro bugs-noreply cgarcia commit-queue mcatanzaro oldest_to_newest 1368043 0 mcatanzaro 2017-11-03 11:49:56 -0700 gtkdoc-scangobj has changed to no longer use a shell when executing its subcommands. In particular, this means we can no longer rely on shell stuff in our run command that we use to run the scanner. See https://bugzilla.gnome.org/show_bug.cgi?id=789800. We currently use the RUN envvar to set LD_LIBRARY_PATH, and the end result is gtkdoc-scangobj attempts to execute our environment variable instead of the scanner itself. Oops. I've tested by replacing the run command with a little script that just prints its environment, and LD_LIBRARY_PATH gets passed down successfully to the child, so I'm not sure why we're using RUN here to set it. (Maybe it was needed for the old Perl version of gtk-doc?) Anyway, we can just set LD_LIBRARY_PATH directly, instead of using RUN, in order to make doc generation work again. 1368044 1 325929 mcatanzaro 2017-11-03 11:52:09 -0700 Created attachment 325929 Patch 1368358 2 325929 commit-queue 2017-11-04 09:47:49 -0700 Comment on attachment 325929 Patch Clearing flags on attachment: 325929 Committed r224458: <https://trac.webkit.org/changeset/224458> 1368359 3 commit-queue 2017-11-04 09:47:51 -0700 All reviewed patches have been landed. Closing bug. 325929 2017-11-03 11:52:09 -0700 2017-11-04 09:47:49 -0700 Patch bug-179252-20171103135208.patch text/plain 2489 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0MzUwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjhlMzJiZjlhZDI0ZmIxYzczZGY2ZWMxN2I4NGFiNDNi YmMxZWQ2My4uMjA1NjgxYTM4MDNhNWZhMWNiN2MzZmRlMzBmZGY5MTczNzJmNDFkYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE3LTExLTAzICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNv bT4KKworICAgICAgICBbR1RLXSBGaXggZ3RrLWRvYyBnZW5lcmF0aW9uIHdpdGggZ3RrLWRvYyBt YXN0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 OTI1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGd0 a2RvYy1zY2FuZ29iaiBoYXMgY2hhbmdlZCB0byBubyBsb25nZXIgdXNlIGEgc2hlbGwgd2hlbiBl eGVjdXRpbmcgaXRzIHN1YmNvbW1hbmRzLiBJbgorICAgICAgICBwYXJ0aWN1bGFyLCB0aGlzIG1l YW5zIHdlIGNhbiBubyBsb25nZXIgcmVseSBvbiBzaGVsbCBzdHVmZiBpbiBvdXIgcnVuIGNvbW1h bmQgdGhhdCB3ZSB1c2UKKyAgICAgICAgdG8gcnVuIHRoZSBzY2FubmVyLiBXZSBjdXJyZW50bHkg dXNlIHRoZSBSVU4gZW52dmFyIHRvIHNldCBMRF9MSUJSQVJZX1BBVEgsIGFuZCB0aGUgZW5kCisg ICAgICAgIHJlc3VsdCBpcyBndGtkb2Mtc2NhbmdvYmogbm93IGF0dGVtcHRzIHRvIGV4ZWN1dGUg b3VyIGVudmlyb25tZW50IHZhcmlhYmxlIGluc3RlYWQgb2YgdGhlCisgICAgICAgIHNjYW5uZXIg aXRzZWxmLiBXZSBjYW4ganVzdCBzZXQgTERfTElCUkFSWV9QQVRIIGRpcmVjdGx5LCBpbnN0ZWFk IG9mIHVzaW5nIFJVTiwgaW4gb3JkZXIgdG8KKyAgICAgICAgbWFrZSBkb2N1bWVudGF0aW9uIGdl bmVyYXRpb24gd29yayBhZ2Fpbi4KKworICAgICAgICAqIGd0ay9ndGtkb2MucHk6CisgICAgICAg IChHVEtEb2MuX3J1bl9ndGtkb2Nfc2NhbmdvYmopOgorCiAyMDE3LTExLTAyICBDYXJsb3MgQWxi ZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdW0pI QnVpbGRdIFVwZGF0ZSBXUEVCYWNrZW5kIGFuZCBXUEVCYWNrZW5kLW1lc2EKZGlmZiAtLWdpdCBh L1Rvb2xzL2d0ay9ndGtkb2MucHkgYi9Ub29scy9ndGsvZ3RrZG9jLnB5CmluZGV4IDQ4Zjg2MmEz MWZhNDc1N2NlZTNkMDVhZDExMDE3ZTA0YWUzZGM0MDAuLjAzYzhlOGU5YjEzNDgxOGUzZWQ0Mjlk ZDg1ZDQ2MDEyMDg5ZTZhNjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2d0ay9ndGtkb2MucHkKKysrIGIv VG9vbHMvZ3RrL2d0a2RvYy5weQpAQCAtMzE5LDkgKzMxOSw5IEBAIGNsYXNzIEdUS0RvYyhvYmpl Y3QpOgogICAgICAgICAgICAgbGRmbGFncyA9ICcgIi1MJXMiICVzICcgJSAoc2VsZi5saWJyYXJ5 X3BhdGgsIGFkZGl0aW9uYWxfbGRmbGFncykgKyBsZGZsYWdzCiAgICAgICAgICAgICBjdXJyZW50 X2xkX2xpYnJhcnlfcGF0aCA9IGVudi5nZXQoJ0xEX0xJQlJBUllfUEFUSCcpCiAgICAgICAgICAg ICBpZiBjdXJyZW50X2xkX2xpYnJhcnlfcGF0aDoKLSAgICAgICAgICAgICAgICBlbnZbJ1JVTidd ID0gJ0xEX0xJQlJBUllfUEFUSD0iJXM6JXMiICcgJSAoc2VsZi5saWJyYXJ5X3BhdGgsIGN1cnJl bnRfbGRfbGlicmFyeV9wYXRoKQorICAgICAgICAgICAgICAgIGVudlsnTERfTElCUkFSWV9QQVRI J10gPSAnJXM6JXMnICUgKHNlbGYubGlicmFyeV9wYXRoLCBjdXJyZW50X2xkX2xpYnJhcnlfcGF0 aCkKICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgZW52WydSVU4nXSA9ICdMRF9M SUJSQVJZX1BBVEg9IiVzIiAnICUgc2VsZi5saWJyYXJ5X3BhdGgKKyAgICAgICAgICAgICAgICBl bnZbJ0xEX0xJQlJBUllfUEFUSCddID0gc2VsZi5saWJyYXJ5X3BhdGgKIAogICAgICAgICBpZiBs ZGZsYWdzOgogICAgICAgICAgICAgZW52WydMREZMQUdTJ10gPSAnJXMgJXMnICUgKGxkZmxhZ3Ms IGVudi5nZXQoJ0xERkxBR1MnLCAnJykpCkBAIC0zMzIsOCArMzMyLDYgQEAgY2xhc3MgR1RLRG9j KG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLmxvZ2dlci5kZWJ1ZygnQ0ZMQUdTPSVzJywgZW52 WydDRkxBR1MnXSkKICAgICAgICAgaWYgJ0xERkxBR1MnIGluIGVudjoKICAgICAgICAgICAgIHNl bGYubG9nZ2VyLmRlYnVnKCdMREZMQUdTICVzJywgZW52WydMREZMQUdTJ10pCi0gICAgICAgIGlm ICdSVU4nIGluIGVudjoKLSAgICAgICAgICAgIHNlbGYubG9nZ2VyLmRlYnVnKCdSVU49JXMnLCBl bnZbJ1JVTiddKQogICAgICAgICBzZWxmLl9ydW5fY29tbWFuZChbJ2d0a2RvYy1zY2FuZ29iaics ICctLW1vZHVsZT0lcycgJSBzZWxmLm1vZHVsZV9uYW1lXSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgZW52PWVudiwgY3dkPXNlbGYub3V0cHV0X2RpcikKIAo=