From unknown Fri Jun 20 20:00:54 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#13002 <13002@debbugs.gnu.org> To: bug#13002 <13002@debbugs.gnu.org> Subject: Status: directory variables in VALAFLAGS are expanded after cd Reply-To: bug#13002 <13002@debbugs.gnu.org> Date: Sat, 21 Jun 2025 03:00:54 +0000 retitle 13002 directory variables in VALAFLAGS are expanded after cd reassign 13002 automake submitter 13002 Daiki Ueno severity 13002 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 26 06:05:44 2012 Received: (at submit) by debbugs.gnu.org; 26 Nov 2012 11:05:44 +0000 Received: from localhost ([127.0.0.1]:39285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TcwVU-00061T-0F for submit@debbugs.gnu.org; Mon, 26 Nov 2012 06:05:44 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36128) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TcwVR-00061L-4H for submit@debbugs.gnu.org; Mon, 26 Nov 2012 06:05:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcwTi-0007Of-Hk for submit@debbugs.gnu.org; Mon, 26 Nov 2012 06:03:58 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:37731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcwTi-0007Ob-EY for submit@debbugs.gnu.org; Mon, 26 Nov 2012 06:03:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcwTY-00020W-Lf for bug-automake@gnu.org; Mon, 26 Nov 2012 06:03:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcwTX-0007LX-O5 for bug-automake@gnu.org; Mon, 26 Nov 2012 06:03:44 -0500 Received: from du-a.org ([219.94.251.20]:47899 helo=www6246ue.sakura.ne.jp) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcwTX-0007LP-El for bug-automake@gnu.org; Mon, 26 Nov 2012 06:03:43 -0500 Message-ID: <87pq30d3sl.fsf-ueno@unixuser.org> From: Daiki Ueno To: bug-automake@gnu.org Subject: directory variables in VALAFLAGS are expanded after cd Date: Mon, 26 Nov 2012 20:03:38 +0900 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 208.118.235.17 X-Spam-Score: -4.2 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.2 (----) Hi, I see quite a few Vala projects setting VALAFLAGS as follows: libfolks_eds_la_VALAFLAGS = \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ ... This is referred by the generated rule in Makefile.in as: $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(libfolks_eds_la_VALAFLAGS) $(VALAFLAGS) -C $(libfolks_eds_la_SOURCES) Here, if $(srcdir) != $(builddir) and $(top_srcdir) is a relative path from $(builddir), the --vapidir option will point to a wrong location. Though this could be worked around by using $(abs_top_srcdir) instead of $(top_srcdir), it looks to me a bit unintuitive. It would be nice that automake handles this case nicely. Regards, -- Daiki Ueno From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 11:31:00 2016 Received: (at 13002) by debbugs.gnu.org; 28 Jul 2016 15:31:00 +0000 Received: from localhost ([127.0.0.1]:49431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSnGz-0003x6-3A for submit@debbugs.gnu.org; Thu, 28 Jul 2016 11:31:00 -0400 Received: from mail-qk0-f178.google.com ([209.85.220.178]:36600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSn4d-0003cs-W9 for 13002@debbugs.gnu.org; Thu, 28 Jul 2016 11:18:18 -0400 Received: by mail-qk0-f178.google.com with SMTP id x1so65448586qkb.3 for <13002@debbugs.gnu.org>; Thu, 28 Jul 2016 08:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=zQ3+VXQSqFXGLZCbsUkIJTMprgDpWciR5eYP/RZrN6A=; b=hUMkmtKjRL0OTMfSGBMkuOUVVBSeEB2WjLzcrTp3S1lwKhKdpYePY7epwHHMtlwDwo h7H3HeumCxqiEO7Jlb8ngTmpVSvqrxNc3i1c4deglRR/hKE96WzE2kOeO9FqCQiGU1ss DiGMAtwYbYM9ZEqUCNH4t+CiwKLF1aka9ntNSLZHWNXmQmt67bs+ToNL4SXER6de7JfM UcWR1n7Y77gswMQG0nsrkfe59I44K/U2WP4uHo3Lo6LPHD+QBYeIZR1hAP1BxH4+XyPa jQKXMbMkPE7FmioLooYmraUTgbaUy2iCeLEITM8/2YLmM8tQBodbuuEumpTt6lmz2DET BTmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=zQ3+VXQSqFXGLZCbsUkIJTMprgDpWciR5eYP/RZrN6A=; b=ECz39fUEvf5ud1rZjouNfiTPrrvIt4GjQjnPACNUCvmRWWYUH1ziZptqbjvX+xditv BFKTzOZgB+g3Ie2tzkxaOia3Dwvb938mEghIKbi9vHUb3zyBzxmQHaSXCNY5fVXeV2W3 lc4Gc6jeRtbpLhvJc2mTDR6YG9F6n47oiDNQ7bAXHPoH84iixsO530n5wDn4QOqe0Rak 23QGb4uoZkReSYI22ENo0jIBQ/oMvH5J8mGlskLQrzXy8Dt+/V0HXJGbwISq1/tc4pO2 NwK/SH6xxZ3a4boLSnE1DS3QxVdMhn64VjCBH6XsGq5aBX94a84LUS9p9tCdJIUHKVdp jbxA== X-Gm-Message-State: AEkoouu4N21YStZWATxTcOMbqlL2WT31DWS1jEcLU055hOe4iK6lnH8bPO/Qdq+4MoF1W74DFWMnUrb3W3MZxQ== X-Received: by 10.55.51.65 with SMTP id z62mr42868034qkz.14.1469719086368; Thu, 28 Jul 2016 08:18:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.233.222.1 with HTTP; Thu, 28 Jul 2016 08:18:05 -0700 (PDT) In-Reply-To: References: From: Daniel Espinosa Date: Thu, 28 Jul 2016 10:18:05 -0500 Message-ID: Subject: Fwd: Bug fix patch To: 13002@debbugs.gnu.org Content-Type: multipart/mixed; boundary=001a114723161049d70538b3a463 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 13002 X-Mailman-Approved-At: Thu, 28 Jul 2016 11:30:55 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --001a114723161049d70538b3a463 Content-Type: multipart/alternative; boundary=001a114723161049ce0538b3a461 --001a114723161049ce0538b3a461 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sorry this is the correct but this patch belongs to. ---------- Forwarded message ---------- From: Daniel Espinosa Date: 2016-07-28 10:16 GMT-05:00 Subject: Bug fix patch To: 16341@debbugs.gnu.org Attached you'll find a patch for this bug, including some improvements to Vala support. --=20 This electronic message may contain privileged and confidential information intended only for the use of the addressees named above. If you are not the intended recipient of this email, we kindly ask you to delete this message and any attachment. You are hereby notified that any use, dissemination, distribution, reproduction of this email is prohibited. If you have received this email in error, please notify sender immediately. Any document, image or any other form of electronic representation of any work attached to this email, is suitable to be protected by copyright enforcement by applicable law in your or sender's Country's and International Legislation Trabajar, la mejor arma para tu superaci=C3=B3n "de grano en grano, se hace la arena" (R) (en tr=C3=A1mite, pero para los cuates: LIBRE) --=20 This electronic message may contain privileged and confidential information intended only for the use of the addressees named above. If you are not the intended recipient of this email, we kindly ask you to delete this message and any attachment. You are hereby notified that any use, dissemination, distribution, reproduction of this email is prohibited. If you have received this email in error, please notify sender immediately. Any document, image or any other form of electronic representation of any work attached to this email, is suitable to be protected by copyright enforcement by applicable law in your or sender's Country's and International Legislation Trabajar, la mejor arma para tu superaci=C3=B3n "de grano en grano, se hace la arena" (R) (en tr=C3=A1mite, pero para los cuates: LIBRE) --001a114723161049ce0538b3a461 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Sorry this is the correct but this patch belongs to.
---------- Forwarded message ----------From: Daniel Espinosa <esodan@gmail.com>Date: 2016-07-28 10:16 GMT-05:00
Subject: Bug fix patch
To: 16341@debbugs.gnu.org


Attached you'll find a patch for this bug, including some = improvements to Vala support.

--
=
This electronic message may contain privileged and confidential information=20 intended only for the use of the addressees named above.=C2=A0 If you are n= ot the intended recipient of this email, we kindly ask you to delete this=20 message and any attachment. You are hereby notified that any use,=20 dissemination, distribution, reproduction of this email is prohibited.=C2= =A0=20 If you have received this email in error, please notify sender=20 immediately.

Any document, image or any other form of electronic representation of any=20 work attached to this email, is suitable to be protected by copyright=20 enforcement by applicable law in your or sender's Country's<= span>=20 and International Legislation
<= /div>

Trabajar, la mejor arma para tu superaci=C3=B3n=
"de grano en grano, se hace la arena" (R) (en tr=C3=A1mite, p= ero para los cuates: LIBRE)



--
<= span>
This electronic message may contain privileged and confidential information=20 intended only for the use of the addressees named above.=C2=A0 If you are n= ot the intended recipient of this email, we kindly ask you to delete this=20 message and any attachment. You are hereby notified that any use,=20 dissemination, distribution, reproduction of this email is prohibited.=C2= =A0=20 If you have received this email in error, please notify sender=20 immediately.

Any document, image or any other form of electronic representation of any=20 work attached to this email, is suitable to be protected by copyright=20 enforcement by applicable law in your or sender's Country's<= span>=20 and International Legislation
<= /div>

Trabajar, la mejor arma para tu superaci=C3=B3n=
"de grano en grano, se hace la arena" (R) (en tr=C3=A1mite, p= ero para los cuates: LIBRE)
--001a114723161049ce0538b3a461-- --001a114723161049d70538b3a463 Content-Type: text/x-patch; charset=US-ASCII; name="0001-Vala-support:improvementsbugfixes.patch" Content-Disposition: attachment; filename="0001-Vala-support:improvementsbugfixes.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ir6gpoqx0 RnJvbSBiNDA2MmM0YmUzNjcyOGMwN2Q3OTY2MDMwNWI5NmVkM2Q2OTcyNDNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgRXNwaW5vc2EgPGVzb2RhbkBnbWFpbC5jb20+CkRh dGU6IFRodSwgMjggSnVsIDIwMTYgMDA6Mzk6NDQgLTA1MDAKU3ViamVjdDogW1BBVENIXSBWYWxh IHN1cHBvcnQ6IGltcHJvdmVtZW50cyBidWcgZml4ZXMKCiogRml4ZWQgYnVnICMxMzAwMiwgbm93 IEF1dG9tYWtlIGdlbmVyYXRlIHN0YW1wcyBvbgogIGJ1aWxkIGRpcmVjdG9yeSBhbmQgdXNlIGNv cnJlY3RseSBWUEFUSCBmb3IgYWxsIHNvdXJjZSBmaWxlcwoKKiBBdXRvbWFrZSBub3cgYWRkIHZh cGkgZ2VuZXJhdGVkIGZpbGVzIGZvciBkaXN0cmlidXRpb24gYW5kCiAgbWFrZSB2YXBpIGRlcGVu ZHMgb24gc3RhbXAKCiogSW1wcm92ZWQgYW5kIGFkZGVkIG5ldyB0ZXN0IGNhc2VzIGZvciBWYWxh IGxpYnMKLS0tCiBiaW4vYXV0b21ha2UuaW4gICAgICAgICAgfCAgMzcgKysrKysrLS0tCiB0L3Zh bGEtbGlicy1kaXN0Y2hlY2suc2ggfCAxOTYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKIHQvdmFsYS1saWJzLXZwYXRoLnNoICAgICB8IDEwOCArKysrKysr KysrKysrKysrKysrKysrKysrKwogdC92YWxhLWxpYnMuc2ggICAgICAgICAgIHwgIDUxICsrKysr KystLS0tLQogdC92YWxhLXZwYXRoLnNoICAgICAgICAgIHwgICAxICsKIDUgZmlsZXMgY2hhbmdl ZCwgMzYxIGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0 IHQvdmFsYS1saWJzLWRpc3RjaGVjay5zaAogY3JlYXRlIG1vZGUgMTAwNjQ0IHQvdmFsYS1saWJz LXZwYXRoLnNoCgpkaWZmIC0tZ2l0IGEvYmluL2F1dG9tYWtlLmluIGIvYmluL2F1dG9tYWtlLmlu CmluZGV4IDNhYmVlNDkuLjMyZmNmNmUgMTAwNjQ0Ci0tLSBhL2Jpbi9hdXRvbWFrZS5pbgorKysg Yi9iaW4vYXV0b21ha2UuaW4KQEAgLTU0MDUsMTEgKzU0MDUsMTEgQEAgc3ViIGxhbmdfdmFsYV9m aW5pc2hfdGFyZ2V0CiAgICAgICBteSAkY19maWxlID0gJHZhbGFfZmlsZTsKICAgICAgIGlmICgk Y19maWxlID1+IHMvKC4qKVwudmFsYSQvJDEuYy8pCiAgICAgICAgIHsKLSAgICAgICAgICAkY19m aWxlID0gIlwkKHNyY2RpcikvJGNfZmlsZSI7Ci0gICAgICAgICAgJG91dHB1dF9ydWxlcyAuPSAi JGNfZmlsZTogXCQoc3JjZGlyKS8ke2Rlcml2ZWR9X3ZhbGEuc3RhbXBcbiIKLSAgICAgICAgICAg IC4gIlx0XEBpZiB0ZXN0IC1mIFwkQDsgdGhlbiA6OyBlbHNlIHJtIC1mIFwkKHNyY2RpcikvJHtk ZXJpdmVkfV92YWxhLnN0YW1wOyBmaVxuIgorICAgICAgICAgICRjX2ZpbGUgPSAiXCQoYnVpbGRk aXIpLyRjX2ZpbGUiOworICAgICAgICAgICRvdXRwdXRfcnVsZXMgLj0gIiRjX2ZpbGU6IFwkKGJ1 aWxkZGlyKS8ke2Rlcml2ZWR9X3ZhbGEuc3RhbXBcbiIKKyAgICAgICAgICAgIC4gIlx0XEBpZiB0 ZXN0IC1mIFwkQDsgdGhlbiA6OyBlbHNlIHJtIC1mIFwkKGJ1aWxkZGlyKS8ke2Rlcml2ZWR9X3Zh bGEuc3RhbXA7IGZpXG4iCiAgICAgICAgICAgICAuICJcdFxAaWYgdGVzdCAtZiBcJEA7IHRoZW4g OjsgZWxzZSBcXFxuIgotICAgICAgICAgICAgLiAiXHQgIFwkKE1BS0UpIFwkKEFNX01BS0VGTEFH UykgXCQoc3JjZGlyKS8ke2Rlcml2ZWR9X3ZhbGEuc3RhbXA7IFxcXG4iCisgICAgICAgICAgICAu ICJcdCAgXCQoTUFLRSkgXCQoQU1fTUFLRUZMQUdTKSBcJChidWlsZGRpcikvJHtkZXJpdmVkfV92 YWxhLnN0YW1wOyBcXFxuIgogICAgICAgICAgICAgLiAiXHRmaVxuIjsKIAkgICRjbGVhbl9maWxl c3skY19maWxlfSA9IE1BSU5UQUlORVJfQ0xFQU47CiAgICAgICAgIH0KQEAgLTU0MjUsMTEgKzU0 MjUsMTEgQEAgc3ViIGxhbmdfdmFsYV9maW5pc2hfdGFyZ2V0CiAJICBpZiAoZ3JlcCAoLyRsYXN0 ZmxhZy8sICgnLUgnLCAnLWgnLCAnLS1oZWFkZXInLCAnLS1pbnRlcm5hbC1oZWFkZXInLAogCSAg ICAgICAgICAgICAgICAgICAgICAgICAgJy0tdmFwaScsICctLWludGVybmFsLXZhcGknLCAnLS1n aXInKSkpCiAJICAgIHsKLQkgICAgICBteSAkaGVhZGVyZmlsZSA9ICJcJChzcmNkaXIpLyRmbGFn IjsKLQkgICAgICAkb3V0cHV0X3J1bGVzIC49ICIkaGVhZGVyZmlsZTogXCQoc3JjZGlyKS8ke2Rl cml2ZWR9X3ZhbGEuc3RhbXBcbiIKLQkJLiAiXHRcQGlmIHRlc3QgLWYgXCRAOyB0aGVuIDo7IGVs c2Ugcm0gLWYgXCQoc3JjZGlyKS8ke2Rlcml2ZWR9X3ZhbGEuc3RhbXA7IGZpXG4iCisJICAgICAg bXkgJGhlYWRlcmZpbGUgPSAiXCQoYnVpbGRkaXIpLyRmbGFnIjsKKwkgICAgICAkb3V0cHV0X3J1 bGVzIC49ICIkaGVhZGVyZmlsZTogXCQoYnVpbGRkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcFxu IgorCQkuICJcdFxAaWYgdGVzdCAtZiBcJEA7IHRoZW4gOjsgZWxzZSBybSAtZiBcJChidWlsZGRp cikvJHtkZXJpdmVkfV92YWxhLnN0YW1wOyBmaVxuIgogCQkuICJcdFxAaWYgdGVzdCAtZiBcJEA7 IHRoZW4gOjsgZWxzZSBcXFxuIgotCQkuICJcdCAgXCQoTUFLRSkgXCQoQU1fTUFLRUZMQUdTKSBc JChzcmNkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcDsgXFxcbiIKKwkJLiAiXHQgIFwkKE1BS0Up IFwkKEFNX01BS0VGTEFHUykgXCQoYnVpbGRkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcDsgXFxc biIKIAkJLiAiXHRmaVxuIjsKIAogCSAgICAgICMgdmFsYWMgaXMgbm90IHVzZWQgd2hlbiBidWls ZGluZyBmcm9tIGRpc3QgdGFyYmFsbHMKQEAgLTU0MzcsNiArNTQzNywyMSBAQCBzdWIgbGFuZ192 YWxhX2ZpbmlzaF90YXJnZXQKIAkgICAgICBwdXNoX2Rpc3RfY29tbW9uICgkaGVhZGVyZmlsZSk7 CiAJICAgICAgJGNsZWFuX2ZpbGVzeyRoZWFkZXJmaWxlfSA9IE1BSU5UQUlORVJfQ0xFQU47CiAJ ICAgIH0KKwkgIGlmIChncmVwICgvJGxhc3RmbGFnLywgKCctLWxpYnJhcnknKSkpCisJICAgIHsK KwkgICAgICBteSAkaGVhZGVyZmlsZSA9ICJcJChidWlsZGRpcikvJGZsYWciOworCSAgICAgICRv dXRwdXRfcnVsZXMgLj0gIiRoZWFkZXJmaWxlLnZhcGk6IFwkKGJ1aWxkZGlyKS8ke2Rlcml2ZWR9 X3ZhbGEuc3RhbXBcbiIKKwkJLiAiXHRcQGlmIHRlc3QgLWYgXCRAOyB0aGVuIDo7IGVsc2Ugcm0g LWYgXCQoYnVpbGRkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcDsgZmlcbiIKKwkJLiAiXHRcQGlm IHRlc3QgLWYgXCRAOyB0aGVuIDo7IGVsc2UgXFxcbiIKKwkJLiAiXHQgIFwkKE1BS0UpIFwkKEFN X01BS0VGTEFHUykgXCQoYnVpbGRkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcDsgXFxcbiIKKwkJ LiAiXHRmaVxuIjsKKworCSAgICAgICMgdmFsYWMgaXMgbm90IHVzZWQgd2hlbiBidWlsZGluZyBm cm9tIGRpc3QgdGFyYmFsbHMKKwkgICAgICAjIGRpc3RyaWJ1dGUgdGhlIGdlbmVyYXRlZCBmaWxl cworCSAgICAgIG15ICR2YXBpID0gIiRoZWFkZXJmaWxlLnZhcGkiOworCSAgICAgIHB1c2hfZGlz dF9jb21tb24gKCR2YXBpKTsKKwkgICAgICAkY2xlYW5fZmlsZXN7JGhlYWRlcmZpbGUuJy52YXBp J30gPSBNQUlOVEFJTkVSX0NMRUFOOworCSAgICB9CiAJICAkbGFzdGZsYWcgPSAkZmxhZzsKIAl9 CiAgICAgfQpAQCAtNTQ2MCwxMCArNTQ3NSwxMCBAQCBzdWIgbGFuZ192YWxhX2ZpbmlzaF90YXJn ZXQKIAogICBteSAkdmVyYm9zZSA9IHZlcmJvc2VfZmxhZyAoJ1ZBTEFDJyk7CiAgIG15ICRzaWxl bnQgPSBzaWxlbnRfZmxhZyAoKTsKLSAgbXkgJHN0YW1wZmlsZSA9ICJcJChzcmNkaXIpLyR7ZGVy aXZlZH1fdmFsYS5zdGFtcCI7CisgIG15ICRzdGFtcGZpbGUgPSAiXCQoYnVpbGRkaXIpLyR7ZGVy aXZlZH1fdmFsYS5zdGFtcCI7CiAKICAgJG91dHB1dF9ydWxlcyAuPQotICAgICJcJChzcmNkaXIp LyR7ZGVyaXZlZH1fdmFsYS5zdGFtcDogQHZhbGFfc291cmNlc1xuIi4KKyAgICAiXCQoYnVpbGRk aXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcDogQHZhbGFfc291cmNlc1xuIi4KICMgU2luY2UgdGhl IEMgZmlsZXMgZ2VuZXJhdGVkIGZyb20gdGhlIHZhbGEgc291cmNlcyBkZXBlbmQgb24gdGhlCiAj ICR7ZGVyaXZlZH1fdmFsYS5zdGFtcCBmaWxlLCB3ZSBtdXN0IGVuc3VyZSBpdHMgdGltZXN0YW1w IGlzIG9sZGVyIHRoYW4KICMgdGhvc2Ugb2YgdGhlIEMgZmlsZXMgZ2VuZXJhdGVkIGJ5IHRoZSB2 YWxhYyBpbnZvY2F0aW9uIGJlbG93ICh0aGlzIGlzCkBAIC01NDcxLDcgKzU0ODYsNyBAQCBzdWIg bGFuZ192YWxhX2ZpbmlzaF90YXJnZXQKICMgVGh1cyB3ZSBuZWVkIHRvIGNyZWF0ZSB0aGUgc3Rh bXAgZmlsZSAqYmVmb3JlKiBpbnZva2luZyB2YWxhYywgYW5kIHRvCiAjIG1vdmUgaXQgdG8gaXRz IGZpbmFsIGxvY2F0aW9uIG9ubHkgYWZ0ZXIgdmFsYWMgaGFzIGJlZW4gaW52b2tlZC4KICAgICAi XHQke3NpbGVudH1ybSAtZiBcJFxAICYmIGVjaG8gc3RhbXAgPiBcJFxALXRcbiIuCi0gICAgIlx0 JHt2ZXJib3NlfVwkKGFtX19jZCkgXCQoc3JjZGlyKSAmJiAkY29tcGlsZSBAdmFsYV9zb3VyY2Vz XG4iLgorICAgICJcdCR7dmVyYm9zZX0gJGNvbXBpbGUgXCReXG4iLgogICAgICJcdCR7c2lsZW50 fW12IC1mIFwkXEAtdCBcJFxAXG4iOwogCiAgIHB1c2hfZGlzdF9jb21tb24gKCRzdGFtcGZpbGUp OwpkaWZmIC0tZ2l0IGEvdC92YWxhLWxpYnMtZGlzdGNoZWNrLnNoIGIvdC92YWxhLWxpYnMtZGlz dGNoZWNrLnNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk5ZjFlOTAKLS0t IC9kZXYvbnVsbAorKysgYi90L3ZhbGEtbGlicy1kaXN0Y2hlY2suc2gKQEAgLTAsMCArMSwxOTYg QEAKKyMhIC9iaW4vc2gKKyMgQ29weXJpZ2h0IChDKSAyMDEyLTIwMTYgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuCisjCisjIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CisjIGl0IHVuZGVyIHRoZSB0ZXJtcyBv ZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5CisjIHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIsIG9yIChhdCB5b3VyIG9w dGlvbikKKyMgYW55IGxhdGVyIHZlcnNpb24uCisjCisjIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmli dXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorIyBidXQgV0lUSE9VVCBB TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorIyBNRVJD SEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhl CisjIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisjCisjIFlv dSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlCisjIGFsb25nIHdpdGggdGhpcyBwcm9ncmFtLiAgSWYgbm90LCBzZWUgPGh0dHA6Ly93 d3cuZ251Lm9yZy9saWNlbnNlcy8+LgorCisjIEJ1aWxkaW5nIGxpYnJhcmllcyAobGlidG9vbCBh bmQgc3RhdGljKSBmcm9tIFZhbGEgc291cmNlcy4KKyMgQW5kIHVzZSBvZiB2YXBpIGZpbGVzIHRv IGNhbGwgQyBjb2RlIGZyb20gVmFsYS4KKworcmVxdWlyZWQ9InZhbGFjIGNjIHBrZy1jb25maWcg bGlidG9vbGl6ZSBHTlVtYWtlIgorYW1fY3JlYXRlX3Rlc3RkaXI9ZW1wdHkKKy4gdGVzdC1pbml0 LnNoCisKK2NhdCA+PiBjb25maWd1cmUuYWMgPDwgJ0VORCcKK0FDX0lOSVQoW2F0ZXN0XSxbMC4x XSkKK0FDX0NPTkZJR19TUkNESVIoW2RhdGEvYXRlc3QucGMuaW5dKQorCitBQ19TVUJTVChbQVBJ X1ZFUlNJT05dLFswXSkKKworQU1fSU5JVF9BVVRPTUFLRQorQU1fTUFJTlRBSU5FUl9NT0RFKFtl bmFibGVdKQorCitBQ19QUk9HX0NDCitBQ19QUk9HX0lOU1RBTEwKK0FNX1BST0dfQVIKK1BLR19Q Uk9HX1BLR19DT05GSUcoWzAuMjJdKQorQU1fUFJPR19WQUxBQyhbMC4zMl0pCisKK1BLR19DSEVD S19NT0RVTEVTKEFURVNULCBbZ2lvLTIuMF0pCisKK0xUX0lOSVQKK0FDX0NPTkZJR19GSUxFUyhb CisJTWFrZWZpbGUKKworCXNyYy9NYWtlZmlsZQorCisJc3JjL2F0ZXN0LSRBUElfVkVSU0lPTi5k ZXBzOnNyYy9hdGVzdC5kZXBzLmluCisKKwlkYXRhL01ha2VmaWxlCisJZGF0YS9hdGVzdC0kQVBJ X1ZFUlNJT04ucGM6ZGF0YS9hdGVzdC5wYy5pbgorCitdLFtdLAorW0FQSV9WRVJTSU9OPSckQVBJ X1ZFUlNJT04nXSkKK0FDX09VVFBVVAorRU5ECisKKworY2F0ID4gTWFrZWZpbGUuYW0gPDwgJ0VO RCcKK1NVQkRJUlM9ZGF0YSBzcmMKK0VORAorCitta2RpciBkYXRhCisKK2NhdCA+IGRhdGEvYXRl c3QucGMuaW4gPDwgJ0VORCcKK3ByZWZpeD1AcHJlZml4QAorZXhlY19wcmVmaXg9QGV4ZWNfcHJl Zml4QAorbGliZGlyPUBsaWJkaXJACitkYXRhcm9vdGRpcj1AZGF0YXJvb3RkaXJACitkYXRhZGly PUBkYXRhZGlyQAoraW5jbHVkZWRpcj1AaW5jbHVkZWRpckAKKworTmFtZTogYXRlc3QtQEFQSV9W RVJTSU9OQAorRGVzY3JpcHRpb246IGF0ZXN0IGxpYnJhcnkKK1ZlcnNpb246IEBWRVJTSU9OQAor UmVxdWlyZXM6IGdsaWItMi4wIGdvYmplY3QtMi4wCitMaWJzOiAtTCR7bGliZGlyfSAtbGF0ZXN0 LUBBUElfVkVSU0lPTkAKK0NmbGFnczogLUkke2luY2x1ZGVkaXJ9L2F0ZXN0LUBBUElfVkVSU0lP TkAKK0VORAorCisKK2NhdCA+IGRhdGEvTWFrZWZpbGUuYW0gPDwgJ0VORCcKKyMgcGtnLWNvbmZp ZyBkYXRhCisjIE5vdGUgdGhhdCB0aGUgdGVtcGxhdGUgZmlsZSBpcyBjYWxsZWQgYXRlc3QucGMu aW4sIGJ1dCBnZW5lcmF0ZXMgYQorIyB2ZXJzaW9uZWQgLnBjIGZpbGUgdXNpbmcgc29tZSBtYWdp YyBpbiBBQ19DT05GSUdfRklMRVMuCitwa2djb25maWdkaXIgPSAkKGxpYmRpcikvcGtnY29uZmln Citwa2djb25maWdfREFUQSA9IGF0ZXN0LSQoQVBJX1ZFUlNJT04pLnBjCisKK0RJU1RDTEVBTkZJ TEVTID0gJChwa2djb25maWdfREFUQSkKK0VYVFJBX0RJU1QgPSBhdGVzdC5wYy5pbgorRU5ECisK K21rZGlyIHNyYworCitjYXQgPiBzcmMvYXRlc3QuZGVwcy5pbiA8PCAnRU5EJworZ2xpYi0yLjAK K0VORAorCisKK2NhdCA+IHNyYy9hdGVzdC52YWxhIDw8ICdFTkQnCit1c2luZyBHTGliOworCitu YW1lc3BhY2UgQXRlc3QgeworCXB1YmxpYyBjbGFzcyBBIHsKKwkJcHVibGljIGJvb2wgZm9vKCkg eyByZXR1cm4gZmFsc2U7IH0KKwl9Cit9CitFTkQKKworY2F0ID4gc3JjL01ha2VmaWxlLmFtIDw8 ICdFTkQnCitsaWJfTFRMSUJSQVJJRVMgPSBsaWJhdGVzdC1AQVBJX1ZFUlNJT05ALmxhCisKK2xp YmF0ZXN0X0BBUElfVkVSU0lPTkBfbGFfU09VUkNFUyA9IFwKKwlhdGVzdC52YWxhIFwKKwljc2Vy dmljZS5jIFwKKwljc2VydmljZS5oIFwKKwkkKE5VTEwpCisKKworbGliYXRlc3RfQEFQSV9WRVJT SU9OQF9sYV9DUFBGTEFHUyA9IFwKKwktRE9LT0tJTURFRklORUQ9MSBcCisJJChOVUxMKQorCits aWJhdGVzdF9AQVBJX1ZFUlNJT05AX2xhX0NGTEFHUyA9IFwKKwkkKEFURVNUX0NGTEFHUykgXAor CSQoV0FSTl9DRkxBR1MpIFwKKwkkKE5VTEwpCisKK2xpYmF0ZXN0X0BBUElfVkVSU0lPTkBfbGFf TElCQUREID0gXAorCSQoQVRFU1RfTElCUykgXAorCSQoTlVMTCkKKworbGliYXRlc3RfQEFQSV9W RVJTSU9OQF9sYV9MREZMQUdTID0gXAorCSQoV0FSTl9MREZMQUdTKSBcCisJJChOVUxMKQorCits aWJhdGVzdF9AQVBJX1ZFUlNJT05AX2xhX1ZBTEFGTEFHUyA9IFwKKwktLXZhcGlkaXI9JChWQVBJ RElSKSBcCisJLS12YXBpZGlyPSQoc3JjZGlyKSBcCisJLS1wa2cgY3NlcnZpY2UgXAorCS0tdGhy ZWFkIFwKKwktLXRhcmdldC1nbGliPTIuNDQgXAorCS0tcGtnIGdsaWItMi4wIFwKKwktSCBhdGVz dC5oIFwKKwktLWxpYnJhcnkgYXRlc3QtQEFQSV9WRVJTSU9OQCBcCisJJChOVUxMKQorCitoZWFk ZXJfREFUQT1hdGVzdC5oCitoZWFkZXJkaXI9JChpbmNsdWRlZGlyKS9hdGVzdC1AQVBJX1ZFUlNJ T05AL2F0ZXN0CisKK2F0ZXN0LUBBUElfVkVSU0lPTkAuZGVwczoKKwljcCBhdGVzdC5kZXBzIGF0 ZXN0LUBBUElfVkVSU0lPTkAuZGVwcworCit2YXBpX0RBVEE9YXRlc3QtQEFQSV9WRVJTSU9OQC52 YXBpIGF0ZXN0LUBBUElfVkVSU0lPTkAuZGVwcwordmFwaWRpcj0kKFZBUElESVIpCisKK0NMRUFO RklMRVMgPSBhdGVzdC1AQVBJX1ZFUlNJT05ALmRlcHMKK0VORAorCisKK2NhdCA+IHNyYy9jc2Vy dmljZS5jIDw8ICdFTkQnCisjaW5jbHVkZSAiY3NlcnZpY2UuaCIKK2ludCBjX3NlcnZpY2VfbXVf Y2FsbCAodm9pZCkKK3sKKyAgcmV0dXJuIE9LT0tJTURFRklORUQ7Cit9CitFTkQKKworY2F0ID4g c3JjL2NzZXJ2aWNlLmggPDwgJ0VORCcKK2ludCBjX3NlcnZpY2VfbXUgKHZvaWQpOworRU5ECisK K2NhdCA+IHNyYy9jc2VydmljZS52YXBpIDw8J0VORCcKK25hbWVzcGFjZSBDU2VydmljZSB7Cisg IHB1YmxpYyBjbGFzcyBNdSB7CisgICAgW0NDb2RlIChjaGVhZGVyX2ZpbGVuYW1lID0gImNzZXJ2 aWNlLmgiLCBjbmFtZSA9ICJjX3NlcnZpY2VfbXVfY2FsbCIpXQorICAgIHB1YmxpYyBpbnQgY2Fs bCAoKTsKKyAgfQorfQorRU5ECisKKworbGlidG9vbGl6ZQorJEFDTE9DQUwKKyRBVVRPQ09ORgor JEFVVE9NQUtFIC1hCisKKy4vY29uZmlndXJlCisKKyRNQUtFCit0ZXN0IC1mIHNyYy9saWJhdGVz dF8wX2xhX3ZhbGEuc3RhbXAKK3Rlc3QgLWYgc3JjL2xpYmF0ZXN0LTAubGEKKworJE1BS0UgZGlz dGNoZWNrCisKKzoKKwpkaWZmIC0tZ2l0IGEvdC92YWxhLWxpYnMtdnBhdGguc2ggYi90L3ZhbGEt bGlicy12cGF0aC5zaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMzBjZTIz Ci0tLSAvZGV2L251bGwKKysrIGIvdC92YWxhLWxpYnMtdnBhdGguc2gKQEAgLTAsMCArMSwxMDgg QEAKKyMhIC9iaW4vc2gKKyMgQ29weXJpZ2h0IChDKSAyMDEyLTIwMTYgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuCisjCisjIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CisjIGl0IHVuZGVyIHRoZSB0ZXJtcyBv ZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5CisjIHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIsIG9yIChhdCB5b3VyIG9w dGlvbikKKyMgYW55IGxhdGVyIHZlcnNpb24uCisjCisjIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmli dXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorIyBidXQgV0lUSE9VVCBB TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorIyBNRVJD SEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhl CisjIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisjCisjIFlv dSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlCisjIGFsb25nIHdpdGggdGhpcyBwcm9ncmFtLiAgSWYgbm90LCBzZWUgPGh0dHA6Ly93 d3cuZ251Lm9yZy9saWNlbnNlcy8+LgorCisjIEJ1aWxkaW5nIGxpYnJhcmllcyAobGlidG9vbCBh bmQgc3RhdGljKSBmcm9tIFZhbGEgc291cmNlcy4KKyMgQW5kIHVzZSBvZiB2YXBpIGZpbGVzIHRv IGNhbGwgQyBjb2RlIGZyb20gVmFsYS4KKworcmVxdWlyZWQ9InZhbGFjIGNjIHBrZy1jb25maWcg bGlidG9vbGl6ZSBHTlVtYWtlIgorYW1fY3JlYXRlX3Rlc3RkaXI9ZW1wdHkKKy4gdGVzdC1pbml0 LnNoCisKK2NhdCA+PiBjb25maWd1cmUuYWMgPDwgJ0VORCcKK0FDX0lOSVQoW3ZhbGFsaWJzXSxb MC4xXSkKKworQUNfQ09ORklHX01BQ1JPX0RJUihbbTRdKQorCitBTV9JTklUX0FVVE9NQUtFCitB TV9QUk9HX0FSCitMVF9JTklUCisKK0FDX1BST0dfQ0MKK0FDX0NPTkZJR19GSUxFUyhbTWFrZWZp bGUgc3JjL01ha2VmaWxlXSkKKworQU1fUFJPR19WQUxBQyhbMC43LjNdKQorUEtHX0NIRUNLX01P RFVMRVMoW0dPQkpFQ1RdLCBbZ29iamVjdC0yLjAgPj0gMi40XSkKKworQUNfT1VUUFVUCitFTkQK KworCitjYXQgPiBNYWtlZmlsZS5hbSA8PCAnRU5EJworU1VCRElSUz1zcmMKK0VORAorCitta2Rp ciBzcmMKKworY2F0ID4gc3JjL01ha2VmaWxlLmFtIDw8ICdFTkQnCitBVVRPTUFLRV9PUFRJT05T ID0gc3ViZGlyLW9iamVjdHMKK2xpYl9MVExJQlJBUklFUyA9IGxpYnNlcnZpY2UubGEKK2xpYnNl cnZpY2VfbGFfU09VUkNFUyA9IHNlcnZpY2UudmFsYSBjc2VydmljZS5jIGNzZXJ2aWNlLmgKK2xp YnNlcnZpY2VfbGFfQ1BQRkxBR1MgPSAtRE9LT0tJTURFRklORUQ9MQorbGlic2VydmljZV9sYV9W QUxBRkxBR1MgPSAtLXZhcGlkaXI9JChzcmNkaXIpIC0tcGtnIGNzZXJ2aWNlIC0tbGlicmFyeSBz ZXJ2aWNlCitBTV9DRkxBR1MgPSAkKEdPQkpFQ1RfQ0ZMQUdTKQorRU5ECisKK2xpYnRvb2xpemUK KyRBQ0xPQ0FMCiskQVVUT0NPTkYKKyRBVVRPTUFLRSAtYQorCitjYXQgPiBzcmMvY3NlcnZpY2Uu YyA8PCAnRU5EJworI2luY2x1ZGUgImNzZXJ2aWNlLmgiCitpbnQgY19zZXJ2aWNlX211X2NhbGwg KHZvaWQpCit7CisgIHJldHVybiBPS09LSU1ERUZJTkVEOworfQorRU5ECisKK2NhdCA+IHNyYy9j c2VydmljZS5oIDw8ICdFTkQnCitpbnQgY19zZXJ2aWNlX211ICh2b2lkKTsKK0VORAorCitjYXQg PiBzcmMvY3NlcnZpY2UudmFwaSA8PCdFTkQnCituYW1lc3BhY2UgQ1NlcnZpY2UgeworICBwdWJs aWMgY2xhc3MgTXUgeworICAgIFtDQ29kZSAoY2hlYWRlcl9maWxlbmFtZSA9ICJjc2VydmljZS5o IiwgY25hbWUgPSAiY19zZXJ2aWNlX211X2NhbGwiKV0KKyAgICBwdWJsaWMgaW50IGNhbGwgKCk7 CisgIH0KK30KK0VORAorCitjYXQgPiBzcmMvc2VydmljZS52YWxhIDw8ICdFTkQnCituYW1lc3Bh Y2UgQ1NlcnZpY2UgeworcHVibGljIGNsYXNzIEdlbmVyYXRvciA6IE9iamVjdCB7CisJcHVibGlj IEdlbmVyYXRvciAoKSB7CisJCXN0ZG91dC5wcmludGYgKCJjb25zdHJ1Y3QgZ2VuZXJhdG9yIik7 CisJfQorCXB1YmxpYyB2b2lkIGluaXQgKCkgeworCQlzdGRvdXQucHJpbnRmICgiaW5pdCBnZW5l cmF0b3IiKTsKKwl9Cit9Cit9CitFTkQKKworbWtkaXIgYnVpbGQKK2NkIGJ1aWxkCisuLi9jb25m aWd1cmUKKworJE1BS0UKK3B3ZAordGVzdCAtZiBzcmMvbGlic2VydmljZV9sYV92YWxhLnN0YW1w Cit0ZXN0IC1mIHNyYy9saWJzZXJ2aWNlLmxhCisKKworOgorCmRpZmYgLS1naXQgYS90L3ZhbGEt bGlicy5zaCBiL3QvdmFsYS1saWJzLnNoCmluZGV4IGJhZGQ1MzguLjYyNTExMTggMTAwNjQ0Ci0t LSBhL3QvdmFsYS1saWJzLnNoCisrKyBiL3QvdmFsYS1saWJzLnNoCkBAIC0xLDUgKzEsNSBAQAog IyEgL2Jpbi9zaAotIyBDb3B5cmlnaHQgKEMpIDIwMTItMjAxNSBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb24sIEluYy4KKyMgQ29weXJpZ2h0IChDKSAyMDEyLTIwMTYgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uLCBJbmMuCiAjCiAjIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2Fu IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CiAjIGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0 aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5CkBAIC0zMiwxMSAr MzIsMTEgQEAgRU5ECiAKIGNhdCA+IE1ha2VmaWxlLmFtIDw8ICdFTkQnCiBBVVRPTUFLRV9PUFRJ T05TID0gc3ViZGlyLW9iamVjdHMKLWxpYl9MSUJSQVJJRVMgPSBsaWJtdS5hCitsaWJfTElCUkFS SUVTID0gbGlic2VydmljZS5hCiBsaWJfTFRMSUJSQVJJRVMgPSBzcmMvbGliemFyZG96LmxhCi1s aWJtdV9hX1NPVVJDRVMgPSBtdS52YWxhIG11Mi5jIG11LnZhcGkgbXUyLmgKLWxpYm11X2FfQ1BQ RkxBR1MgPSAtRE9LT0tJTURFRklORUQ9MQotbGlibXVfYV9WQUxBRkxBR1MgPSAtLXZhcGlkaXI9 JChzcmNkaXIpCitsaWJzZXJ2aWNlX2FfU09VUkNFUyA9IHNlcnZpY2UudmFsYSBjc2VydmljZS5j IGNzZXJ2aWNlLmgKK2xpYnNlcnZpY2VfYV9DUFBGTEFHUyA9IC1ET0tPS0lNREVGSU5FRD0xCits aWJzZXJ2aWNlX2FfVkFMQUZMQUdTID0gLS12YXBpZGlyPSQoc3JjZGlyKSAtLXBrZyBjc2Vydmlj ZSAtLWxpYnJhcnkgc2VydmljZQogQU1fQ0ZMQUdTID0gJChHT0JKRUNUX0NGTEFHUykKIHNyY19s aWJ6YXJkb3pfbGFfTElCQUREID0gJChHT0JKRUNUX0xJQlMpCiBzcmNfbGliemFyZG96X2xhX1NP VVJDRVMgPSBzcmMvemFyZG96LWZvby52YWxhIHNyYy96YXJkb3otYmFyLnZhbGEKQEAgLTUxLDI4 ICs1MSwzNyBAQCAkQVVUT01BS0UgLWEKIAogLi9jb25maWd1cmUKIAotY2F0ID4gbXUyLmMgPDwg J0VORCcKLSNpbmNsdWRlICJtdTIuaCIKLWludCBtdTIgKHZvaWQpCitjYXQgPiBjc2VydmljZS5j IDw8ICdFTkQnCisjaW5jbHVkZSAiY3NlcnZpY2UuaCIKK2ludCBjX3NlcnZpY2VfbXVfY2FsbCAo dm9pZCkKIHsKICAgcmV0dXJuIE9LT0tJTURFRklORUQ7CiB9CiBFTkQKIAotY2F0ID4gbXUyLmgg PDwgJ0VORCcKLWludCBtdTIgKHZvaWQpOworY2F0ID4gY3NlcnZpY2UuaCA8PCAnRU5EJworaW50 IGNfc2VydmljZV9tdSAodm9pZCk7CiBFTkQKIAotY2F0ID4gbXUudmFwaSA8PCdFTkQnCi1bQ0Nv ZGUgKGNoZWFkZXJfZmlsZW5hbWUgPSAibXUyLmgiLCBjbmFtZSA9ICJtdTIiKV0KLXB1YmxpYyBp bnQgY19tdTIgKCk7CitjYXQgPiBjc2VydmljZS52YXBpIDw8J0VORCcKK25hbWVzcGFjZSBDU2Vy dmljZSB7CisgIHB1YmxpYyBjbGFzcyBNdSB7CisgICAgW0NDb2RlIChjaGVhZGVyX2ZpbGVuYW1l ID0gImNzZXJ2aWNlLmgiLCBjbmFtZSA9ICJjX3NlcnZpY2VfbXVfY2FsbCIpXQorICAgIHB1Ymxp YyBpbnQgY2FsbCAoKTsKKyAgfQorfQogRU5ECiAKLWNhdCA+IG11LnZhbGEgPDwgJ0VORCcKLWlu dCBtYWluICgpCi17Ci0gIHN0ZG91dC5wcmludGYgKCJtdW11bXVcbiIpOwotICByZXR1cm4gY19t dTIgKCk7CitjYXQgPiBzZXJ2aWNlLnZhbGEgPDwgJ0VORCcKK25hbWVzcGFjZSBDU2VydmljZSB7 CitwdWJsaWMgY2xhc3MgR2VuZXJhdG9yIDogT2JqZWN0IHsKKwlwdWJsaWMgR2VuZXJhdG9yICgp IHsKKwkJc3Rkb3V0LnByaW50ZiAoImNvbnN0cnVjdCBnZW5lcmF0b3IiKTsKKwl9CisJcHVibGlj IHZvaWQgaW5pdCAoKSB7CisJCXN0ZG91dC5wcmludGYgKCJpbml0IGdlbmVyYXRvciIpOworCX0K K30KIH0KIEVORAogCkBAIC04NywxMiArOTYsMTIgQEAgcHVibGljIGNsYXNzIEZvbyB7CiBFTkQK IAogJE1BS0UKLXRlc3QgLWYgbGlibXUuYQordGVzdCAtZiBsaWJzZXJ2aWNlLmEKIHRlc3QgLWYg c3JjL2xpYnphcmRvei5sYQotJEZHUkVQICJtdW11bXUiIG11LmMKKyRGR1JFUCAiY29uc3RydWN0 IGdlbmVyYXRvciIgc2VydmljZS5jCiAkRkdSRVAgIkZvb0Zvb0ZvbyIgc3JjL3phcmRvei1mb28u YwogJEZHUkVQICJCYXJCYXJCYXIiIHNyYy96YXJkb3otYmFyLmMKLXRlc3QgLWYgbGlibXVfYV92 YWxhLnN0YW1wCit0ZXN0IC1mIGxpYnNlcnZpY2VfYV92YWxhLnN0YW1wCiB0ZXN0IC1mIHNyY19s aWJ6YXJkb3pfbGFfdmFsYS5zdGFtcAogCiAkTUFLRSBkaXN0Y2hlY2sKZGlmZiAtLWdpdCBhL3Qv dmFsYS12cGF0aC5zaCBiL3QvdmFsYS12cGF0aC5zaAppbmRleCBmZGI4MDJmLi4yY2IyMjA5IDEw MDY0NAotLS0gYS90L3ZhbGEtdnBhdGguc2gKKysrIGIvdC92YWxhLXZwYXRoLnNoCkBAIC03Myw2 ICs3Myw3IEBAICRNQUtFCiB0ZXN0IC1mIC4uL2Zvb192YWxhLnN0YW1wCiB0ZXN0IC1mIC4uL2Jh cl92YWxhLnN0YW1wCiBncmVwIGJhcmJhcmJhciAuLi9oZWxsby5jCiskTUFLRSBkaXN0Y2hlY2sK IAogIyBSZWJ1aWxkIHJ1bGVzIGFyZSBub3QgdXNlbGVzc2x5IHRyaWdnZXJlZC4KICRNQUtFIC1x Ci0tIAoyLjguMQoK --001a114723161049d70538b3a463-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 18 21:34:19 2020 Received: (at 13002) by debbugs.gnu.org; 19 Jul 2020 01:34:19 +0000 Received: from localhost ([127.0.0.1]:59620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwyDS-0003Jq-Bz for submit@debbugs.gnu.org; Sat, 18 Jul 2020 21:34:19 -0400 Received: from freefriends.org ([96.88.95.60]:34926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwyDO-0003Jf-IY for 13002@debbugs.gnu.org; Sat, 18 Jul 2020 21:34:08 -0400 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (freefriends.org [96.88.95.60]) by freefriends.org (8.14.7/8.14.7) with ESMTP id 06J1Y5xW010218 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 18 Jul 2020 19:34:05 -0600 Received: (from apache@localhost) by freefriends.org (8.14.7/8.14.7/Submit) id 06J1Y4Hh010217; Sat, 18 Jul 2020 19:34:04 -0600 Date: Sat, 18 Jul 2020 19:34:04 -0600 Message-Id: <202007190134.06J1Y4Hh010217@freefriends.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="IQY2HoWFhB" Content-Transfer-Encoding: 7bit From: Karl Berry To: esodan@gmail.com Subject: Re: bug#13002: Fwd: Bug fix patch In-Reply-To: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --IQY2HoWFhB Content-Type: text/plain; charset=us-ascii Content-Description: message body text Content-Transfer-Encoding: 7bit Hi Daniel, Attached you'll find a patch for this bug, including some improvements to Vala support. Thanks again for this patch and the copyright assignment. Unfortunately, after locally applying the patch, several of your new tests fail with make (dist)check, as well as some of the existing vala tests. FAIL: t/vala-headers.sh FAIL: t/vala-libs-distcheck.sh FAIL: t/vala-non-recursive-setup.sh FAIL: t/vala-parallel.sh FAIL: t/vala-recursive-setup.sh FAIL: t/vala-vpath.sh Looking at the logs, for instance for vala-vpath.sh, the test -f ../foo_vala.stamp from the build/ subdir does not find the file, since the stamp files are also in the build/ subdir. Which seems correct, but I am not sure what's intentional and what's erroneous. Any chance you can look into this? I will attach the patch as I have it locally now. (This is the output from git diff --staged; if it's easier for you work with format-patch output, just let me know.) There were a couple other vala-related changes made between now and when you submitted the patch, but I don't think they affect your work. Here are their ChangeLog entries: 2020-06-06 Karl Berry This change fixes https://bugs.gnu.org/41726. * t/vala-mix2.sh: extern in .h, initialization in .c. GCC 10 defaults to -fno-common. 2020-04-05 Colomban Wendling This change fixes https://bugs.gnu.org/18734. * bin/automake.in (lang_vala_finish_target): anchor option regexp so that, e.g., an argument "vapi" does not match the option --vapi. --IQY2HoWFhB Content-Type: application/octet-stream Content-Disposition: attachment; filename="vala-vpath.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3QvdmFsYS1saWJzLWRpc3RjaGVjay5zaCBiL3QvdmFsYS1saWJzLWRpc3Rj aGVjay5zaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45OWYxZTkwCi0tLSAv ZGV2L251bGwKKysrIGIvdC92YWxhLWxpYnMtZGlzdGNoZWNrLnNoCkBAIC0wLDAgKzEsMTk2IEBA CisjISAvYmluL3NoCisjIENvcHlyaWdodCAoQykgMjAxMi0yMDE2IEZyZWUgU29mdHdhcmUgRm91 bmRhdGlvbiwgSW5jLgorIworIyBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorIyBpdCB1bmRlciB0aGUgdGVybXMgb2Yg dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorIyB0aGUgRnJl ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyLCBvciAoYXQgeW91ciBvcHRp b24pCisjIGFueSBsYXRlciB2ZXJzaW9uLgorIworIyBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0 ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyMgYnV0IFdJVEhPVVQgQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMgTUVSQ0hB TlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQor IyBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ug c2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGlj ZW5zZQorIyBhbG9uZyB3aXRoIHRoaXMgcHJvZ3JhbS4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3 LmdudS5vcmcvbGljZW5zZXMvPi4KKworIyBCdWlsZGluZyBsaWJyYXJpZXMgKGxpYnRvb2wgYW5k IHN0YXRpYykgZnJvbSBWYWxhIHNvdXJjZXMuCisjIEFuZCB1c2Ugb2YgdmFwaSBmaWxlcyB0byBj YWxsIEMgY29kZSBmcm9tIFZhbGEuCisKK3JlcXVpcmVkPSJ2YWxhYyBjYyBwa2ctY29uZmlnIGxp YnRvb2xpemUgR05VbWFrZSIKK2FtX2NyZWF0ZV90ZXN0ZGlyPWVtcHR5CisuIHRlc3QtaW5pdC5z aAorCitjYXQgPj4gY29uZmlndXJlLmFjIDw8ICdFTkQnCitBQ19JTklUKFthdGVzdF0sWzAuMV0p CitBQ19DT05GSUdfU1JDRElSKFtkYXRhL2F0ZXN0LnBjLmluXSkKKworQUNfU1VCU1QoW0FQSV9W RVJTSU9OXSxbMF0pCisKK0FNX0lOSVRfQVVUT01BS0UKK0FNX01BSU5UQUlORVJfTU9ERShbZW5h YmxlXSkKKworQUNfUFJPR19DQworQUNfUFJPR19JTlNUQUxMCitBTV9QUk9HX0FSCitQS0dfUFJP R19QS0dfQ09ORklHKFswLjIyXSkKK0FNX1BST0dfVkFMQUMoWzAuMzJdKQorCitQS0dfQ0hFQ0tf TU9EVUxFUyhBVEVTVCwgW2dpby0yLjBdKQorCitMVF9JTklUCitBQ19DT05GSUdfRklMRVMoWwor CU1ha2VmaWxlCisKKwlzcmMvTWFrZWZpbGUKKworCXNyYy9hdGVzdC0kQVBJX1ZFUlNJT04uZGVw czpzcmMvYXRlc3QuZGVwcy5pbgorCisJZGF0YS9NYWtlZmlsZQorCWRhdGEvYXRlc3QtJEFQSV9W RVJTSU9OLnBjOmRhdGEvYXRlc3QucGMuaW4KKworXSxbXSwKK1tBUElfVkVSU0lPTj0nJEFQSV9W RVJTSU9OJ10pCitBQ19PVVRQVVQKK0VORAorCisKK2NhdCA+IE1ha2VmaWxlLmFtIDw8ICdFTkQn CitTVUJESVJTPWRhdGEgc3JjCitFTkQKKworbWtkaXIgZGF0YQorCitjYXQgPiBkYXRhL2F0ZXN0 LnBjLmluIDw8ICdFTkQnCitwcmVmaXg9QHByZWZpeEAKK2V4ZWNfcHJlZml4PUBleGVjX3ByZWZp eEAKK2xpYmRpcj1AbGliZGlyQAorZGF0YXJvb3RkaXI9QGRhdGFyb290ZGlyQAorZGF0YWRpcj1A ZGF0YWRpckAKK2luY2x1ZGVkaXI9QGluY2x1ZGVkaXJACisKK05hbWU6IGF0ZXN0LUBBUElfVkVS U0lPTkAKK0Rlc2NyaXB0aW9uOiBhdGVzdCBsaWJyYXJ5CitWZXJzaW9uOiBAVkVSU0lPTkAKK1Jl cXVpcmVzOiBnbGliLTIuMCBnb2JqZWN0LTIuMAorTGliczogLUwke2xpYmRpcn0gLWxhdGVzdC1A QVBJX1ZFUlNJT05ACitDZmxhZ3M6IC1JJHtpbmNsdWRlZGlyfS9hdGVzdC1AQVBJX1ZFUlNJT05A CitFTkQKKworCitjYXQgPiBkYXRhL01ha2VmaWxlLmFtIDw8ICdFTkQnCisjIHBrZy1jb25maWcg ZGF0YQorIyBOb3RlIHRoYXQgdGhlIHRlbXBsYXRlIGZpbGUgaXMgY2FsbGVkIGF0ZXN0LnBjLmlu LCBidXQgZ2VuZXJhdGVzIGEKKyMgdmVyc2lvbmVkIC5wYyBmaWxlIHVzaW5nIHNvbWUgbWFnaWMg aW4gQUNfQ09ORklHX0ZJTEVTLgorcGtnY29uZmlnZGlyID0gJChsaWJkaXIpL3BrZ2NvbmZpZwor cGtnY29uZmlnX0RBVEEgPSBhdGVzdC0kKEFQSV9WRVJTSU9OKS5wYworCitESVNUQ0xFQU5GSUxF UyA9ICQocGtnY29uZmlnX0RBVEEpCitFWFRSQV9ESVNUID0gYXRlc3QucGMuaW4KK0VORAorCitt a2RpciBzcmMKKworY2F0ID4gc3JjL2F0ZXN0LmRlcHMuaW4gPDwgJ0VORCcKK2dsaWItMi4wCitF TkQKKworCitjYXQgPiBzcmMvYXRlc3QudmFsYSA8PCAnRU5EJwordXNpbmcgR0xpYjsKKworbmFt ZXNwYWNlIEF0ZXN0IHsKKwlwdWJsaWMgY2xhc3MgQSB7CisJCXB1YmxpYyBib29sIGZvbygpIHsg cmV0dXJuIGZhbHNlOyB9CisJfQorfQorRU5ECisKK2NhdCA+IHNyYy9NYWtlZmlsZS5hbSA8PCAn RU5EJworbGliX0xUTElCUkFSSUVTID0gbGliYXRlc3QtQEFQSV9WRVJTSU9OQC5sYQorCitsaWJh dGVzdF9AQVBJX1ZFUlNJT05AX2xhX1NPVVJDRVMgPSBcCisJYXRlc3QudmFsYSBcCisJY3NlcnZp Y2UuYyBcCisJY3NlcnZpY2UuaCBcCisJJChOVUxMKQorCisKK2xpYmF0ZXN0X0BBUElfVkVSU0lP TkBfbGFfQ1BQRkxBR1MgPSBcCisJLURPS09LSU1ERUZJTkVEPTEgXAorCSQoTlVMTCkKKworbGli YXRlc3RfQEFQSV9WRVJTSU9OQF9sYV9DRkxBR1MgPSBcCisJJChBVEVTVF9DRkxBR1MpIFwKKwkk KFdBUk5fQ0ZMQUdTKSBcCisJJChOVUxMKQorCitsaWJhdGVzdF9AQVBJX1ZFUlNJT05AX2xhX0xJ QkFERCA9IFwKKwkkKEFURVNUX0xJQlMpIFwKKwkkKE5VTEwpCisKK2xpYmF0ZXN0X0BBUElfVkVS U0lPTkBfbGFfTERGTEFHUyA9IFwKKwkkKFdBUk5fTERGTEFHUykgXAorCSQoTlVMTCkKKworbGli YXRlc3RfQEFQSV9WRVJTSU9OQF9sYV9WQUxBRkxBR1MgPSBcCisJLS12YXBpZGlyPSQoVkFQSURJ UikgXAorCS0tdmFwaWRpcj0kKHNyY2RpcikgXAorCS0tcGtnIGNzZXJ2aWNlIFwKKwktLXRocmVh ZCBcCisJLS10YXJnZXQtZ2xpYj0yLjQ0IFwKKwktLXBrZyBnbGliLTIuMCBcCisJLUggYXRlc3Qu aCBcCisJLS1saWJyYXJ5IGF0ZXN0LUBBUElfVkVSU0lPTkAgXAorCSQoTlVMTCkKKworaGVhZGVy X0RBVEE9YXRlc3QuaAoraGVhZGVyZGlyPSQoaW5jbHVkZWRpcikvYXRlc3QtQEFQSV9WRVJTSU9O QC9hdGVzdAorCithdGVzdC1AQVBJX1ZFUlNJT05ALmRlcHM6CisJY3AgYXRlc3QuZGVwcyBhdGVz dC1AQVBJX1ZFUlNJT05ALmRlcHMKKwordmFwaV9EQVRBPWF0ZXN0LUBBUElfVkVSU0lPTkAudmFw aSBhdGVzdC1AQVBJX1ZFUlNJT05ALmRlcHMKK3ZhcGlkaXI9JChWQVBJRElSKQorCitDTEVBTkZJ TEVTID0gYXRlc3QtQEFQSV9WRVJTSU9OQC5kZXBzCitFTkQKKworCitjYXQgPiBzcmMvY3NlcnZp Y2UuYyA8PCAnRU5EJworI2luY2x1ZGUgImNzZXJ2aWNlLmgiCitpbnQgY19zZXJ2aWNlX211X2Nh bGwgKHZvaWQpCit7CisgIHJldHVybiBPS09LSU1ERUZJTkVEOworfQorRU5ECisKK2NhdCA+IHNy Yy9jc2VydmljZS5oIDw8ICdFTkQnCitpbnQgY19zZXJ2aWNlX211ICh2b2lkKTsKK0VORAorCitj YXQgPiBzcmMvY3NlcnZpY2UudmFwaSA8PCdFTkQnCituYW1lc3BhY2UgQ1NlcnZpY2UgeworICBw dWJsaWMgY2xhc3MgTXUgeworICAgIFtDQ29kZSAoY2hlYWRlcl9maWxlbmFtZSA9ICJjc2Vydmlj ZS5oIiwgY25hbWUgPSAiY19zZXJ2aWNlX211X2NhbGwiKV0KKyAgICBwdWJsaWMgaW50IGNhbGwg KCk7CisgIH0KK30KK0VORAorCisKK2xpYnRvb2xpemUKKyRBQ0xPQ0FMCiskQVVUT0NPTkYKKyRB VVRPTUFLRSAtYQorCisuL2NvbmZpZ3VyZQorCiskTUFLRQordGVzdCAtZiBzcmMvbGliYXRlc3Rf MF9sYV92YWxhLnN0YW1wCit0ZXN0IC1mIHNyYy9saWJhdGVzdC0wLmxhCisKKyRNQUtFIGRpc3Rj aGVjaworCis6CisKZGlmZiAtLWdpdCBhL3QvdmFsYS1saWJzLXZwYXRoLnNoIGIvdC92YWxhLWxp YnMtdnBhdGguc2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzMwY2UyMwot LS0gL2Rldi9udWxsCisrKyBiL3QvdmFsYS1saWJzLXZwYXRoLnNoCkBAIC0wLDAgKzEsMTA4IEBA CisjISAvYmluL3NoCisjIENvcHlyaWdodCAoQykgMjAxMi0yMDE2IEZyZWUgU29mdHdhcmUgRm91 bmRhdGlvbiwgSW5jLgorIworIyBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorIyBpdCB1bmRlciB0aGUgdGVybXMgb2Yg dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorIyB0aGUgRnJl ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyLCBvciAoYXQgeW91ciBvcHRp b24pCisjIGFueSBsYXRlciB2ZXJzaW9uLgorIworIyBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0 ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyMgYnV0IFdJVEhPVVQgQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMgTUVSQ0hB TlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQor IyBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ug c2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGlj ZW5zZQorIyBhbG9uZyB3aXRoIHRoaXMgcHJvZ3JhbS4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3 LmdudS5vcmcvbGljZW5zZXMvPi4KKworIyBCdWlsZGluZyBsaWJyYXJpZXMgKGxpYnRvb2wgYW5k IHN0YXRpYykgZnJvbSBWYWxhIHNvdXJjZXMuCisjIEFuZCB1c2Ugb2YgdmFwaSBmaWxlcyB0byBj YWxsIEMgY29kZSBmcm9tIFZhbGEuCisKK3JlcXVpcmVkPSJ2YWxhYyBjYyBwa2ctY29uZmlnIGxp YnRvb2xpemUgR05VbWFrZSIKK2FtX2NyZWF0ZV90ZXN0ZGlyPWVtcHR5CisuIHRlc3QtaW5pdC5z aAorCitjYXQgPj4gY29uZmlndXJlLmFjIDw8ICdFTkQnCitBQ19JTklUKFt2YWxhbGlic10sWzAu MV0pCisKK0FDX0NPTkZJR19NQUNST19ESVIoW200XSkKKworQU1fSU5JVF9BVVRPTUFLRQorQU1f UFJPR19BUgorTFRfSU5JVAorCitBQ19QUk9HX0NDCitBQ19DT05GSUdfRklMRVMoW01ha2VmaWxl IHNyYy9NYWtlZmlsZV0pCisKK0FNX1BST0dfVkFMQUMoWzAuNy4zXSkKK1BLR19DSEVDS19NT0RV TEVTKFtHT0JKRUNUXSwgW2dvYmplY3QtMi4wID49IDIuNF0pCisKK0FDX09VVFBVVAorRU5ECisK KworY2F0ID4gTWFrZWZpbGUuYW0gPDwgJ0VORCcKK1NVQkRJUlM9c3JjCitFTkQKKworbWtkaXIg c3JjCisKK2NhdCA+IHNyYy9NYWtlZmlsZS5hbSA8PCAnRU5EJworQVVUT01BS0VfT1BUSU9OUyA9 IHN1YmRpci1vYmplY3RzCitsaWJfTFRMSUJSQVJJRVMgPSBsaWJzZXJ2aWNlLmxhCitsaWJzZXJ2 aWNlX2xhX1NPVVJDRVMgPSBzZXJ2aWNlLnZhbGEgY3NlcnZpY2UuYyBjc2VydmljZS5oCitsaWJz ZXJ2aWNlX2xhX0NQUEZMQUdTID0gLURPS09LSU1ERUZJTkVEPTEKK2xpYnNlcnZpY2VfbGFfVkFM QUZMQUdTID0gLS12YXBpZGlyPSQoc3JjZGlyKSAtLXBrZyBjc2VydmljZSAtLWxpYnJhcnkgc2Vy dmljZQorQU1fQ0ZMQUdTID0gJChHT0JKRUNUX0NGTEFHUykKK0VORAorCitsaWJ0b29saXplCisk QUNMT0NBTAorJEFVVE9DT05GCiskQVVUT01BS0UgLWEKKworY2F0ID4gc3JjL2NzZXJ2aWNlLmMg PDwgJ0VORCcKKyNpbmNsdWRlICJjc2VydmljZS5oIgoraW50IGNfc2VydmljZV9tdV9jYWxsICh2 b2lkKQoreworICByZXR1cm4gT0tPS0lNREVGSU5FRDsKK30KK0VORAorCitjYXQgPiBzcmMvY3Nl cnZpY2UuaCA8PCAnRU5EJworaW50IGNfc2VydmljZV9tdSAodm9pZCk7CitFTkQKKworY2F0ID4g c3JjL2NzZXJ2aWNlLnZhcGkgPDwnRU5EJworbmFtZXNwYWNlIENTZXJ2aWNlIHsKKyAgcHVibGlj IGNsYXNzIE11IHsKKyAgICBbQ0NvZGUgKGNoZWFkZXJfZmlsZW5hbWUgPSAiY3NlcnZpY2UuaCIs IGNuYW1lID0gImNfc2VydmljZV9tdV9jYWxsIildCisgICAgcHVibGljIGludCBjYWxsICgpOwor ICB9Cit9CitFTkQKKworY2F0ID4gc3JjL3NlcnZpY2UudmFsYSA8PCAnRU5EJworbmFtZXNwYWNl IENTZXJ2aWNlIHsKK3B1YmxpYyBjbGFzcyBHZW5lcmF0b3IgOiBPYmplY3QgeworCXB1YmxpYyBH ZW5lcmF0b3IgKCkgeworCQlzdGRvdXQucHJpbnRmICgiY29uc3RydWN0IGdlbmVyYXRvciIpOwor CX0KKwlwdWJsaWMgdm9pZCBpbml0ICgpIHsKKwkJc3Rkb3V0LnByaW50ZiAoImluaXQgZ2VuZXJh dG9yIik7CisJfQorfQorfQorRU5ECisKK21rZGlyIGJ1aWxkCitjZCBidWlsZAorLi4vY29uZmln dXJlCisKKyRNQUtFCitwd2QKK3Rlc3QgLWYgc3JjL2xpYnNlcnZpY2VfbGFfdmFsYS5zdGFtcAor dGVzdCAtZiBzcmMvbGlic2VydmljZS5sYQorCisKKzoKKwo= --IQY2HoWFhB-- From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 23 19:15:07 2020 Received: (at 13002) by debbugs.gnu.org; 23 Oct 2020 23:15:07 +0000 Received: from localhost ([127.0.0.1]:58683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kW6H5-0002ov-B3 for submit@debbugs.gnu.org; Fri, 23 Oct 2020 19:15:07 -0400 Received: from mail-oi1-f182.google.com ([209.85.167.182]:46104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kW6H3-0002o4-Dn for 13002@debbugs.gnu.org; Fri, 23 Oct 2020 19:15:06 -0400 Received: by mail-oi1-f182.google.com with SMTP id l4so3605923oii.13 for <13002@debbugs.gnu.org>; Fri, 23 Oct 2020 16:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:from:date:message-id:subject:to; bh=luY4LehruxNDwt1vdPFMYDf7NcJG+bCQLxwEw8uHjjY=; b=38e1fpWWQMXyb/E7mWEPqfDGFESIl9M8Vdmcnkpx3uN00FlQUWoq+Ohzaclk6rbHcI whbie8qpkurhVolFzkFR8iEUDaG8RtgMXIWBWvZEleHu5fhVujyG0u8TvpDiefRE/yO9 B7LoiXBmk6yLaCGylV07HA49zSFqsw8T6Efmg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=luY4LehruxNDwt1vdPFMYDf7NcJG+bCQLxwEw8uHjjY=; b=SL/cr7jfADp6bIzsMY3igWty1O+jxMFud1JSuh6RactNlR0Yx7K7vtweaQK8OuOtkv YErV3y7kU/CuZmMOa+wt5zEJKfX3TZxdp2vlnfsLbWP5AhleuS1PtB/kUs+g71rvgHOk CfjJyMuf/I3Ev3htPei0F02yPZWEuyXCwhMH88k8GCsDmAIuLHSWipGv0iQzK1o8rQne tUs/xLmda2YSoY4xPYq+WWC5g3DXv8NRsLpykz/r/A5OqkEQEUAQ/g2WPi6j5A4rR1LH 9jMgUnXscRX+Bf9BWfamYIlqchcfiqI+lL29bvfzd5ur4SLXnpM7Uub5PsymGZObWSgT So7Q== X-Gm-Message-State: AOAM532nmzW7cB084dBWpX94H93U0qHn1/BrePmbv9XJS2YEuNlaleYP I64I4LiQIZpmXOQtey7h583k7aejA5DwaTQ7BfPltJ1c0hg= X-Google-Smtp-Source: ABdhPJyXDAHRnDe1leXc4vm1V7h7KayGwY2oBhpob2SN2iCGJmjMXuA0UaXmYlQU8G7kjl93pbxs6CLzoz2QRhT8WhQ= X-Received: by 2002:aca:918:: with SMTP id 24mr3822891oij.179.1603494899145; Fri, 23 Oct 2020 16:14:59 -0700 (PDT) MIME-Version: 1.0 From: Reuben Thomas Date: Sat, 24 Oct 2020 00:14:48 +0100 Message-ID: Subject: Dealing with C intermediate files To: 13002@debbugs.gnu.org Content-Type: multipart/alternative; boundary="000000000000dcf89a05b25ebf0f" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 13002 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000dcf89a05b25ebf0f Content-Type: text/plain; charset="UTF-8" I've had a look at the patch now, and found and fixed one bug. However, an issue comes up for VPATH builds that needs a more thorough fix: C files generated from Vala sources are shipped by "make dist" and hence end up in srcdir, but in a VPATH build with a Vala compiler, they will be in builddir. Unlike include files, you can't simply tell cc to look in two places for the file it is to compile, so some other solution is needed. There are various other cases in which I'm aware of generated sources being shipped in tarballs, but they're all different sorts of special cases. For example, configure is shipped, but it's always in srcdir. Other files, e.g. man pages generated by help2man, have special rules to avoid regeneration, but are not themselves used to generate further files. So, I couldn't see a model to follow. I can see a couple of options: 1. Treat valac-generated files as normal intermediate files, don't ship them in make dist, and require a Vala compiler to build Vala sources. This is not a huge deal, as almost all Vala programs will require the same libraries as Vala itself, i.e. glib (and gio?). 2. Add build-aux/valac, a "missing" script that just copies a C file from srcdir to builddir if it is newer than the corresponding Vala file, and otherwise gives an error. Using the "missing" mechanism to add limited functionality seems a fairly autotools-y thing to do. Any other ideas? -- https://rrt.sc3d.org --000000000000dcf89a05b25ebf0f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I've had a look at the patch now, a= nd found and fixed one bug.

However, an issue comes up for VPATH builds that needs a more thoroug= h fix: C files generated from Vala sources are shipped by "make dist&q= uot; and hence end up in srcdir, but in a VPATH build with a Vala compiler,= they will be in builddir. Unlike include files, you can't simply tell = cc to look in two places for the file it is to compile, so some other solut= ion is needed.

There a= re various other cases in which I'm aware of generated sources being sh= ipped in tarballs, but they're all different sorts of special cases. Fo= r example, configure is shipped, but it's always in srcdir. Other files= , e.g. man pages generated by help2man, have special rules to avoid regener= ation, but are not themselves used to generate further files. So, I couldn&= #39;t see a model to follow.

I can see a couple of options:

<= div class=3D"gmail_default" style=3D"font-family:arial,helvetica,sans-serif= ;font-size:small">1. Treat valac-generated files as normal intermediate fil= es, don't ship them in make dist, and require a Vala compiler to build = Vala sources. This is not a huge deal, as almost all Vala programs will req= uire the same libraries as Vala itself, i.e. glib (and gio?).

2. Add build-aux/valac, a "mis= sing" script that just copies a C file from srcdir to builddir if it i= s newer than the corresponding Vala file, and otherwise gives an error. Usi= ng the "missing" mechanism to add limited functionality seems a f= airly autotools-y thing to do.

Any other ideas?

--
--000000000000dcf89a05b25ebf0f-- From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 24 11:23:10 2020 Received: (at 13002) by debbugs.gnu.org; 24 Oct 2020 15:23:10 +0000 Received: from localhost ([127.0.0.1]:34307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWLNu-00023u-Jn for submit@debbugs.gnu.org; Sat, 24 Oct 2020 11:23:10 -0400 Received: from mailout02.t-online.de ([194.25.134.17]:42122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWLNs-00023l-0G for 13002@debbugs.gnu.org; Sat, 24 Oct 2020 11:23:09 -0400 Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout02.t-online.de (Postfix) with SMTP id 98FF741E7431 for <13002@debbugs.gnu.org>; Sat, 24 Oct 2020 17:23:06 +0200 (CEST) Received: from [192.168.178.26] (XRP4uEZ-rhKXk-rtG6fnKUiDiBSAkh+LnLp0njNRJW0EHMoLpKm-k9Ml1cgVHCNg7B@[87.154.42.179]) by fwd18.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1kWLNo-2Of8KG0; Sat, 24 Oct 2020 17:23:04 +0200 Subject: Re: bug#13002: Dealing with C intermediate files To: 13002@debbugs.gnu.org References: <87pq30d3sl.fsf-ueno@unixuser.org> From: =?UTF-8?Q?Hans-Bernhard_Br=c3=b6ker?= Message-ID: Date: Sat, 24 Oct 2020 17:22:58 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ID: XRP4uEZ-rhKXk-rtG6fnKUiDiBSAkh+LnLp0njNRJW0EHMoLpKm-k9Ml1cgVHCNg7B X-TOI-EXPURGATEID: 150726::1603552984-00012C5A-17724C8B/0/0 CLEAN NORMAL X-TOI-MSGID: fdb8834d-4545-4f1a-9ddb-a504cc98a352 X-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: 13002 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) Am 24.10.2020 um 01:14 schrieb Reuben Thomas via Bug reports for Automake: > Unlike include files, you can't simply tell cc to > look in two places for the file it is to compile, so some other solution > is needed. Actually the traditional VPATH mechanism does not distinguish types of files at all. C source files can be vpath-searched quite fine. > So, I couldn't see a model to follow. The obvious canonical examples would have to be lex and yacc. They generate .c and .h files into the blddir, and automake has built-in mechanisms to include the generated sources into the tarball. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 24 11:53:30 2020 Received: (at 13002) by debbugs.gnu.org; 24 Oct 2020 15:53:30 +0000 Received: from localhost ([127.0.0.1]:34379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWLrG-0002pM-0E for submit@debbugs.gnu.org; Sat, 24 Oct 2020 11:53:30 -0400 Received: from freefriends.org ([96.88.95.60]:58118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWLrD-0002pE-Qu for 13002@debbugs.gnu.org; Sat, 24 Oct 2020 11:53:28 -0400 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (freefriends.org [96.88.95.60]) by freefriends.org (8.14.7/8.14.7) with ESMTP id 09OFrQp8014730 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 24 Oct 2020 09:53:26 -0600 Received: (from karl@localhost) by freefriends.org (8.14.7/8.14.7/Submit) id 09OFrPqb014727; Sat, 24 Oct 2020 09:53:25 -0600 Date: Sat, 24 Oct 2020 09:53:25 -0600 Message-Id: <202010241553.09OFrPqb014727@freefriends.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: Karl Berry To: HBBroeker@t-online.de Subject: Re: bug#13002: Dealing with C intermediate files In-Reply-To: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The obvious canonical examples would have to be lex and yacc. They generate .c and .h files into the blddir, and automake has built-in mechanisms to include the generated sources into the tarball. No argument there, but vala is so much newer than lex and yacc, especially in terms of Automake support. I don't see the need to create in these latter days yet another special case for treating intermediate files non-intermediately. Reuben's option 1 seems simplest to me: just treat the vala intermediate files as intermediate. Not in make dist. Jim/Paul/anyone, wdyt? From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 24 12:31:16 2020 Received: (at 13002) by debbugs.gnu.org; 24 Oct 2020 16:31:16 +0000 Received: from localhost ([127.0.0.1]:35001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWMRl-0003wD-VC for submit@debbugs.gnu.org; Sat, 24 Oct 2020 12:31:16 -0400 Received: from mailout06.t-online.de ([194.25.134.19]:60488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWMRg-0003vy-LZ for 13002@debbugs.gnu.org; Sat, 24 Oct 2020 12:31:13 -0400 Received: from fwd16.aul.t-online.de (fwd16.aul.t-online.de [172.20.26.243]) by mailout06.t-online.de (Postfix) with SMTP id 427A24168B63; Sat, 24 Oct 2020 18:31:07 +0200 (CEST) Received: from [192.168.178.26] (rIvXaiZV8hKh+Jctr4FS5-ZaE5rukBlLRx1GIK8BUmqN-NzEmUMcDC0xw6XOuZ0Q7M@[87.154.42.179]) by fwd16.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1kWMRd-10JmCG0; Sat, 24 Oct 2020 18:31:05 +0200 Subject: Re: bug#13002: Dealing with C intermediate files To: Karl Berry References: <202010241553.09OFrPqb014727@freefriends.org> From: =?UTF-8?Q?Hans-Bernhard_Br=c3=b6ker?= Message-ID: <7c7d8552-8b05-3e51-3fbb-f5164558c33b@t-online.de> Date: Sat, 24 Oct 2020 18:31:04 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <202010241553.09OFrPqb014727@freefriends.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ID: rIvXaiZV8hKh+Jctr4FS5-ZaE5rukBlLRx1GIK8BUmqN-NzEmUMcDC0xw6XOuZ0Q7M X-TOI-EXPURGATEID: 150726::1603557065-00013EA2-0532BFAA/0/0 CLEAN NORMAL X-TOI-MSGID: 63e58338-c2df-476d-ab6f-b7d89b71bf7b X-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) Am 24.10.2020 um 17:53 schrieb Karl Berry: > The obvious canonical examples would have to be lex and yacc. They > generate .c and .h files into the blddir, and automake has built-in > mechanisms to include the generated sources into the tarball. > > No argument there, but vala is so much newer than lex and yacc, > especially in terms of Automake support. I don't see the need to create > in these latter days yet another special case for treating intermediate > files non-intermediately. Well, so how about un-special-casing the existing machinery a bit? It's quite exactly the same job that needs to be done, so at the very least, the existing yacc/lex handling code could serve as a template. With a bit of good look, the end result might be that yacc, lex and vala are all just triggering a single, shared implementation, which can also be made available for generic usage by other source-code generating tools. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 24 17:24:46 2020 Received: (at 13002) by debbugs.gnu.org; 24 Oct 2020 21:24:46 +0000 Received: from localhost ([127.0.0.1]:35313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWR1q-000733-FG for submit@debbugs.gnu.org; Sat, 24 Oct 2020 17:24:46 -0400 Received: from freefriends.org ([96.88.95.60]:33000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWR1o-00072v-7x for 13002@debbugs.gnu.org; Sat, 24 Oct 2020 17:24:44 -0400 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (freefriends.org [96.88.95.60]) by freefriends.org (8.14.7/8.14.7) with ESMTP id 09OLOg6p024210 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 24 Oct 2020 15:24:43 -0600 Received: (from apache@localhost) by freefriends.org (8.14.7/8.14.7/Submit) id 09OLOfZ3024209; Sat, 24 Oct 2020 15:24:41 -0600 Date: Sat, 24 Oct 2020 15:24:41 -0600 Message-Id: <202010242124.09OLOfZ3024209@freefriends.org> From: Karl Berry To: HBBroeker@t-online.de Subject: Re: bug#13002: Dealing with C intermediate files In-Reply-To: <7c7d8552-8b05-3e51-3fbb-f5164558c33b@t-online.de> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) quite exactly the same job that needs to be done It's the same job, but lex and yacc are not at all the "same" as vala. They are fundamental Unix utilities that have been around forever. Whereas vala is a relatively recent invention, far less ubiquitous. So I see no reason to treat them the same way. Also, the point of having the lex/yacc .c files in make dist in the first place is to reduce interdependencies among packages. But merely distributing the .c files for vala does not seem likely tome to be enough to actually eliminate the need for vala in practice. Even if it is, looking to the future, it seems to me it would be better to treat intermediate files as intermediate, and not distribute them in make dist. lex/yacc (and .info, etc.) have to be grandfathered in, but creating new such special cases feels like a mistake to me. Every one of the cases is a hassle in the code and causes plenty of confusion for users. Let's not compound the problems. -k From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 28 13:31:31 2020 Received: (at 13002) by debbugs.gnu.org; 28 Oct 2020 17:31:31 +0000 Received: from localhost ([127.0.0.1]:50496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXpI7-0007Kc-MJ for submit@debbugs.gnu.org; Wed, 28 Oct 2020 13:31:31 -0400 Received: from mail-ot1-f51.google.com ([209.85.210.51]:37787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXpI2-0007Aq-SI for 13002@debbugs.gnu.org; Wed, 28 Oct 2020 13:31:18 -0400 Received: by mail-ot1-f51.google.com with SMTP id m22so4947210ots.4 for <13002@debbugs.gnu.org>; Wed, 28 Oct 2020 10:31:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:from:date:message-id:subject:to; bh=nyQS/Y+AV9z/Rybyg8JbNarTTBMQxrMz+lt4BG2AaI4=; b=JaEl673FfLJrRmFYT6Zt044K/exKUKrujPeHgohOPh1QWzujmvRUEsI5/WSnFsn2d3 YEzAyZhV16bGLq53us85Tl+WMIqphn3Q7cViL7LbEV0vBCvh5Aiarm0jtdauOyaa3WWh XUXjt2bDSrSqi1bP8HU/zin9/minKkbbVhd5k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=nyQS/Y+AV9z/Rybyg8JbNarTTBMQxrMz+lt4BG2AaI4=; b=tBKWaLz3E0vhh22NSBQXfCxhzXE4wLAt8dvHWO+l75koC9PweNS0Z1IR8qaNOgsrxu xaPc7YZIE7jZrR8E/Z7sDXl3UgNU5j23uwZa7qN1+n3GtfZNeqwLAxo6HOCIb4erK+mE AFU5FDlitmU/sDELuL2lMs4kPrla1/w190DOPIBjEnSYcmpTgwxfHTlROsCNHgH5qGuj aumSZNuBhYzBfHEs3dEbr/WWE5nVJbn3jMus8SrMQaBRs8SMLLOpDz6Jk6XqgRBDmPwx JhYpoyR9EjOiq2R9HhzxLBMJ7ln4giFQiwqekelJuIv9kZ2xfHe0NNwV0cf/HxlPCulQ oQxQ== X-Gm-Message-State: AOAM530hNMmQvhb/LWrDLVZX5Up/U6tE4fd4kEHe1Jc3eSgp169jkAgr +kb4anXxwFPn0V0PmA4R3mBpb8MjXqU2FpR9fEJsRa0A82U= X-Google-Smtp-Source: ABdhPJx9/r85x4ir3m3iWdujXN36GBV4QlIrbKJSXgHm9IHZfVdD/nwrwMb1gW7rD4lMjOvK+WtHMNjMTKQWj844TIo= X-Received: by 2002:a9d:7586:: with SMTP id s6mr304465otk.46.1603906268724; Wed, 28 Oct 2020 10:31:08 -0700 (PDT) MIME-Version: 1.0 From: Reuben Thomas Date: Wed, 28 Oct 2020 17:30:56 +0000 Message-ID: Subject: Updated, fixed patch To: 13002@debbugs.gnu.org Content-Type: multipart/mixed; boundary="00000000000066be5405b2be87c3" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 13002 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --00000000000066be5405b2be87c3 Content-Type: multipart/alternative; boundary="00000000000066be5205b2be87c1" --00000000000066be5205b2be87c1 Content-Type: text/plain; charset="UTF-8" I have taken Daniel Espinosa's patch and improved it so that it fixes all the test failures. Some of the failures were actually left-over changes to the tests required by Daniel's patch, which (correctly) considers the primary location of C files generated by valac to be builddir, not srcdir. One change in particular is quite awkward, and could do with other eyes, to see if it's correct, and even if so, whether it could be simplified: the additional check in line 5737 of automake.in which checks whether there's a pre-built .c file in srcdir, and, if srcdir != builddir, copies the file there if it is newer than the corresponding .vala file. Having worked on this patch, I do wonder whether the hacks involved are worth it. It seems to me there are two sensible options: 1. Add more support to automake for files that can be either generated or distributed. (Have I overlooked support for this?) 2. Remove the support for distributing Vala projects as C files that do not require a Vala compiler. The Vala compiler is portable and has much the same dependencies as most Vala projects (that is, a C compiler and glib). Without one of these, bugs and fragility in Vala support are likely to continue. -- https://rrt.sc3d.org --00000000000066be5205b2be87c1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I have taken Daniel Espinosa's patc= h and improved it so that it fixes all the test failures. Some of the failu= res were actually left-over changes to the tests required by Daniel's p= atch, which (correctly) considers the primary location of C files generated= by valac to be builddir, not srcdir.

One change in particular is quite awkward, and could do wit= h other eyes, to see if it's correct, and even if so, whether it could = be simplified: the additional check in line 5737 of automake.in which checks whether there's a pre-built .c fil= e in srcdir, and, if srcdir !=3D builddir, copies the file there if it is n= ewer than the corresponding .vala file.

<= div class=3D"gmail_default" style=3D"font-family:arial,helvetica,sans-serif= ;font-size:small">Having worked on this patch, I do wonder whether the hack= s involved are worth it. It seems to me there are two sensible options:

1. Add more support to au= tomake for files that can be either generated or distributed. (Have I overl= ooked support for this?)

2. Remove the support for distributing Vala projects as C files that do = not require a Vala compiler. The Vala compiler is portable and has much the= same dependencies as most Vala projects (that is, a C compiler and glib).<= /div>

Without one of these, = bugs and fragility in Vala support are likely to continue.

--
--00000000000066be5205b2be87c1-- --00000000000066be5405b2be87c3 Content-Type: text/x-patch; charset="UTF-8"; name="0001-Improve-Vala-support-closes-13002.patch" Content-Disposition: attachment; filename="0001-Improve-Vala-support-closes-13002.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kgtoddhk0 RnJvbSA2MDMzNzNiZTgzOWE4N2NiMGVlOTdhMTZmNGEyNDNkODZiYmFlNzJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSZXViZW4gVGhvbWFzIDxycnRAc2MzZC5vcmc+CkRhdGU6IFdl ZCwgMjggT2N0IDIwMjAgMDk6NDI6MjEgKzAwMDAKU3ViamVjdDogW1BBVENIXSBJbXByb3ZlIFZh bGEgc3VwcG9ydCAoY2xvc2VzICMxMzAwMikKTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBl OiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhi aXQKClRoaXMgY29tbWl0IGlzIG1vc3RseSB3b3JrIGJ5IERhbmllbCBFc3Bpbm9zYSwgYnV0IGFu eSBidWdzIGFyZSBSZXViZW4KVGhvbWFz4oCZcywgd2hvIGZpbmlzaGVkIGl0IG9mZiEKCiogTkVX UzogbWVudGlvbiB0aGVzZSBjaGFuZ2VzLgoqIGJpbi9hdXRvbWFrZS5pbjogZ2VuZXJhdGVkIEMg ZmlsZXMgZ28gaW4gYnVpbGRkaXIsIG5vdCBzcmNkaXIuICBEaXN0cmlidXRlCiAgdGhlIGhlYWRl ciBmaWxlcyBnZW5lcmF0ZWQgZnJvbSBWQVBJIGZpbGVzLgoqIHQvdmFsYS1saWJzLWRpc3RjaGVj ay5zaDogbmV3IHRlc3QgZm9yIOKAnG1ha2UgZGlzdGNoZWNr4oCdIG9mIGEgVmFsYSBsaWJyYXJ5 LgoqIHQvdmFsYS1saWJzLXZwYXRoLnNoOiBuZXcgdGVzdCBmb3IgYSBWUEFUSCBidWlsZCBvZiBh IFZhbGEgbGlicmFyeS4KKiB0L3ZhbGEtbGlicy5zaDogYWRkIGxvY2FsIFZBUElzIHVzZWQgYXMg ZXh0ZXJuYWwgLS1wYWNrYWdlIHRvIHRlc3QKKiB0L3ZhbGEteyxub259LXJlY3Vyc2l2ZS1zZXR1 cC5zaDogd2UgbmVlZCB0byBtYWtlIG1haW50YWluZXItY2xlYW4gYXQgb25lCiAgcG9pbnQgdG8g cmVtb3ZlIHN0YW1wIGZpbGVzIHRvIGF2b2lkIGNvbmZ1c2luZyBhIFZQQVRIIGJ1aWxkIHBlcmZv cm1lZCBhZnRlcgogIGEgbm9uLVZQQVRIIGJ1aWxkLgoqIHQvdmFsYS17cGFyYWxsZWwscGVyLXRh cmdldC1mbGFncyxyZWN1cnNpdmUtc2V0dXAsdnBhdGh9LnNoOiBzb21lIHRlc3QgcGF0aHMKICBu ZWVkIGNoYW5naW5nIHRvIHRha2UgaW50byBhY2NvdW50IHRoYXQgZ2VuZXJhdGVkIEMgZmlsZXMg bm93IGdvIGluCiAgYnVpbGRkaXIuCi0tLQogTkVXUyAgICAgICAgICAgICAgICAgICAgICAgICAg fCAgIDYgKysKIGJpbi9hdXRvbWFrZS5pbiAgICAgICAgICAgICAgIHwgIDQ0ICsrKysrLS0tCiB0 L2xpc3Qtb2YtdGVzdHMubWsgICAgICAgICAgICB8ICAgMiArCiB0L3ZhbGEtbGlicy1kaXN0Y2hl Y2suc2ggICAgICB8IDE5NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiB0L3Zh bGEtbGlicy12cGF0aC5zaCAgICAgICAgICB8IDEwOCArKysrKysrKysrKysrKysrKysrCiB0L3Zh bGEtbGlicy5zaCAgICAgICAgICAgICAgICB8ICA0OSArKysrKy0tLS0KIHQvdmFsYS1ub24tcmVj dXJzaXZlLXNldHVwLnNoIHwgICAzICstCiB0L3ZhbGEtcGFyYWxsZWwuc2ggICAgICAgICAgICB8 ICAgNCArLQogdC92YWxhLXBlci10YXJnZXQtZmxhZ3Muc2ggICAgfCAgIDQgKy0KIHQvdmFsYS1y ZWN1cnNpdmUtc2V0dXAuc2ggICAgIHwgIDE4ICsrLS0KIHQvdmFsYS12cGF0aC5zaCAgICAgICAg ICAgICAgIHwgIDMzICsrKy0tLQogMTEgZmlsZXMgY2hhbmdlZCwgNDA1IGluc2VydGlvbnMoKyks IDYyIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHQvdmFsYS1saWJzLWRpc3RjaGVj ay5zaAogY3JlYXRlIG1vZGUgMTAwNjQ0IHQvdmFsYS1saWJzLXZwYXRoLnNoCgpkaWZmIC0tZ2l0 IGEvTkVXUyBiL05FV1MKaW5kZXggOWM2OWU0OGQxLi4wMTBjZDM3NTYgMTAwNjQ0Ci0tLSBhL05F V1MKKysrIGIvTkVXUwpAQCAtODEsNiArODEsMTAgQEAgTmV3IGluID8uPy4/OgogCiAgIC0gdmFs YWMgYXJndW1lbnQgbWF0Y2hpbmcgbW9yZSBwcmVjaXNlLCB0byBhdm9pZCBnYXJiYWdlIGluIERJ U1RfQ09NTU9OLgogCisgIC0gU3VwcG9ydCBmb3IgVmFsYSBpbiBWUEFUSCBidWlsZHMgZml4ZWQg c28gdGhhdCBib3RoIGZyZXNobHktZ2VuZXJhdGVkIGFuZAorICAgIGRpc3RyaWJ1dGVkIEMgZmls ZXMgd29yaywgYW5kIG9wZXJhdGlvbiBpcyBtb3JlIHJlbGlhYmxlIHdpdGggb3Igd2l0aG91dAor ICAgIGFuIGluc3RhbGxlZCB2YWxhYy4KKwogKiBEaXN0cmlidXRpb24KIAogICAtIG5ldyB2YXJp YWJsZSBBTV9ESVNUQ0hFQ0tfRFZJX1RBUkdFVCwgdG8gYWxsb3cgb3ZlcnJpZGluZyB0aGUKQEAg LTkxLDYgKzk1LDggQEAgTmV3IGluID8uPy4/OgogICAtIFJlbW92ZWQgZnVuY3Rpb24gdXBfdG9f ZGF0ZV9wIGluIGxpYi9BdXRvbWFrZS9GaWxlVXRpbHMucG0uCiAgICAgV2UgYmVsaWV2ZSB0aGlz IGZ1bmN0aW9uIGlzIGNvbXBsZXRlbHkgdW51c2VkLgogCisgIC0gU3VwcG9ydCBmb3IgaW4tdHJl ZSBWYWxhIGxpYnJhcmllcyBpbXByb3ZlZC4KKwogfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCiBOZXcg aW4gMS4xNi4yOgpkaWZmIC0tZ2l0IGEvYmluL2F1dG9tYWtlLmluIGIvYmluL2F1dG9tYWtlLmlu CmluZGV4IGE4OGI4MzVhNS4uMzFjNzIzODJhIDEwMDY0NAotLS0gYS9iaW4vYXV0b21ha2UuaW4K KysrIGIvYmluL2F1dG9tYWtlLmluCkBAIC01NzMwLDEzICs1NzMwLDE4IEBAIHN1YiBsYW5nX3Zh bGFfZmluaXNoX3RhcmdldAogICAgICAgbXkgJGNfZmlsZSA9ICR2YWxhX2ZpbGU7CiAgICAgICBp ZiAoJGNfZmlsZSA9fiBzLyguKilcLnZhbGEkLyQxLmMvKQogICAgICAgICB7Ci0gICAgICAgICAg JGNfZmlsZSA9ICJcJChzcmNkaXIpLyRjX2ZpbGUiOwotICAgICAgICAgICRvdXRwdXRfcnVsZXMg Lj0gIiRjX2ZpbGU6IFwkKHNyY2RpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wXG4iCi0gICAgICAg ICAgICAuICJcdFxAaWYgdGVzdCAtZiBcJEA7IHRoZW4gOjsgZWxzZSBybSAtZiBcJChzcmNkaXIp LyR7ZGVyaXZlZH1fdmFsYS5zdGFtcDsgZmlcbiIKKyAgICAgICAgICBteSAkYnVpbHRfY19maWxl ID0gIlwkKGJ1aWxkZGlyKS8kY19maWxlIjsKKyAgICAgICAgICBteSAkYnVpbHRfZGlyID0gZGly bmFtZSAkYnVpbHRfY19maWxlOworICAgICAgICAgIG15ICRiYXNlX2NfZmlsZSA9IGJhc2VuYW1l ICRjX2ZpbGU7CisgICAgICAgICAgJG91dHB1dF9ydWxlcyAuPSAiJGJ1aWx0X2NfZmlsZTogXCQo YnVpbGRkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcFxuIgorICAgICAgICAgICAgLiAiXHRcQGlm IHRlc3QgISAtZiBcJEAgJiYgdGVzdCBcJChzcmNkaXIpICE9IFwkKGJ1aWxkZGlyKSAmJiB0ZXN0 IC1uIFwiXCRcJChmaW5kIC1MIFwkKHNyY2RpcikvJGNfZmlsZSAtcHJ1bmUgLW5ld2VyIFwkKHNy Y2RpcikvJHZhbGFfZmlsZSlcIjsgdGhlbiBjcCAtcCBcJChzcmNkaXIpLyRjX2ZpbGUgJGJ1aWx0 X2NfZmlsZTsgZmlcbiIKKyAgICAgICAgICAgIC4gIlx0XEBpZiB0ZXN0IC1mIFwkQDsgdGhlbiA6 OyBlbHNlIHJtIC1mIFwkKGJ1aWxkZGlyKS8ke2Rlcml2ZWR9X3ZhbGEuc3RhbXA7IGZpXG4iCiAg ICAgICAgICAgICAuICJcdFxAaWYgdGVzdCAtZiBcJEA7IHRoZW4gOjsgZWxzZSBcXFxuIgotICAg ICAgICAgICAgLiAiXHQgIFwkKE1BS0UpIFwkKEFNX01BS0VGTEFHUykgXCQoc3JjZGlyKS8ke2Rl cml2ZWR9X3ZhbGEuc3RhbXA7IFxcXG4iCisgICAgICAgICAgICAuICJcdCAgXCQoTUFLRSkgXCQo QU1fTUFLRUZMQUdTKSBcJChidWlsZGRpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wOyBcXFxuIgor ICAgICAgICAgICAgLiAiXHQgIGlmIHRlc3QgJGJ1aWx0X2RpciAhPSAuOyB0aGVuIG12ICRiYXNl X2NfZmlsZSAkYnVpbHRfZGlyLzsgZmkgXFxcbiIKICAgICAgICAgICAgIC4gIlx0ZmlcbiI7Ci0J ICAkY2xlYW5fZmlsZXN7JGNfZmlsZX0gPSBNQUlOVEFJTkVSX0NMRUFOOworCSAgJGNsZWFuX2Zp bGVzeyRidWlsdF9jX2ZpbGV9ID0gRElTVF9DTEVBTjsKKwkgICRjbGVhbl9maWxlc3siXCQoc3Jj ZGlyKS8kY19maWxlIn0gPSBNQUlOVEFJTkVSX0NMRUFOOwogICAgICAgICB9CiAgICAgfQogCkBA IC01NzUwLDExICs1NzU1LDExIEBAIHN1YiBsYW5nX3ZhbGFfZmluaXNoX3RhcmdldAogCSAgaWYg KGdyZXAgKC9eJGxhc3RmbGFnJC8sICgnLUgnLCAnLWgnLCAnLS1oZWFkZXInLCAnLS1pbnRlcm5h bC1oZWFkZXInLAogCSAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS12YXBpJywgJy0taW50 ZXJuYWwtdmFwaScsICctLWdpcicpKSkKIAkgICAgewotCSAgICAgIG15ICRoZWFkZXJmaWxlID0g IlwkKHNyY2RpcikvJGZsYWciOwotCSAgICAgICRvdXRwdXRfcnVsZXMgLj0gIiRoZWFkZXJmaWxl OiBcJChzcmNkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcFxuIgotCQkuICJcdFxAaWYgdGVzdCAt ZiBcJEA7IHRoZW4gOjsgZWxzZSBybSAtZiBcJChzcmNkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFt cDsgZmlcbiIKKwkgICAgICBteSAkaGVhZGVyZmlsZSA9ICJcJChidWlsZGRpcikvJGZsYWciOwor CSAgICAgICRvdXRwdXRfcnVsZXMgLj0gIiRoZWFkZXJmaWxlOiBcJChidWlsZGRpcikvJHtkZXJp dmVkfV92YWxhLnN0YW1wXG4iCisJCS4gIlx0XEBpZiB0ZXN0IC1mIFwkQDsgdGhlbiA6OyBlbHNl IHJtIC1mIFwkKGJ1aWxkZGlyKS8ke2Rlcml2ZWR9X3ZhbGEuc3RhbXA7IGZpXG4iCiAJCS4gIlx0 XEBpZiB0ZXN0IC1mIFwkQDsgdGhlbiA6OyBlbHNlIFxcXG4iCi0JCS4gIlx0ICBcJChNQUtFKSBc JChBTV9NQUtFRkxBR1MpIFwkKHNyY2RpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wOyBcXFxuIgor CQkuICJcdCAgXCQoTUFLRSkgXCQoQU1fTUFLRUZMQUdTKSBcJChidWlsZGRpcikvJHtkZXJpdmVk fV92YWxhLnN0YW1wOyBcXFxuIgogCQkuICJcdGZpXG4iOwogCiAJICAgICAgIyB2YWxhYyBpcyBu b3QgdXNlZCB3aGVuIGJ1aWxkaW5nIGZyb20gZGlzdCB0YXJiYWxscwpAQCAtNTc2Miw2ICs1NzY3 LDIxIEBAIHN1YiBsYW5nX3ZhbGFfZmluaXNoX3RhcmdldAogCSAgICAgIHB1c2hfZGlzdF9jb21t b24gKCRoZWFkZXJmaWxlKTsKIAkgICAgICAkY2xlYW5fZmlsZXN7JGhlYWRlcmZpbGV9ID0gTUFJ TlRBSU5FUl9DTEVBTjsKIAkgICAgfQorCSAgaWYgKGdyZXAgKC8kbGFzdGZsYWcvLCAoJy0tbGli cmFyeScpKSkKKwkgICAgeworCSAgICAgIG15ICRoZWFkZXJmaWxlID0gIlwkKGJ1aWxkZGlyKS8k ZmxhZyI7CisJICAgICAgJG91dHB1dF9ydWxlcyAuPSAiJGhlYWRlcmZpbGUudmFwaTogXCQoYnVp bGRkaXIpLyR7ZGVyaXZlZH1fdmFsYS5zdGFtcFxuIgorCQkuICJcdFxAaWYgdGVzdCAtZiBcJEA7 IHRoZW4gOjsgZWxzZSBybSAtZiBcJChidWlsZGRpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wOyBm aVxuIgorCQkuICJcdFxAaWYgdGVzdCAtZiBcJEA7IHRoZW4gOjsgZWxzZSBcXFxuIgorCQkuICJc dCAgXCQoTUFLRSkgXCQoQU1fTUFLRUZMQUdTKSBcJChidWlsZGRpcikvJHtkZXJpdmVkfV92YWxh LnN0YW1wOyBcXFxuIgorCQkuICJcdGZpXG4iOworCisJICAgICAgIyB2YWxhYyBpcyBub3QgdXNl ZCB3aGVuIGJ1aWxkaW5nIGZyb20gZGlzdCB0YXJiYWxscworCSAgICAgICMgZGlzdHJpYnV0ZSB0 aGUgZ2VuZXJhdGVkIGZpbGVzCisJICAgICAgbXkgJHZhcGkgPSAiJGhlYWRlcmZpbGUudmFwaSI7 CisJICAgICAgcHVzaF9kaXN0X2NvbW1vbiAoJHZhcGkpOworCSAgICAgICRjbGVhbl9maWxlc3sk aGVhZGVyZmlsZS4nLnZhcGknfSA9IE1BSU5UQUlORVJfQ0xFQU47CisJICAgIH0KIAkgICRsYXN0 ZmxhZyA9ICRmbGFnOwogCX0KICAgICB9CkBAIC01Nzg1LDEwICs1ODA1LDEwIEBAIHN1YiBsYW5n X3ZhbGFfZmluaXNoX3RhcmdldAogCiAgIG15ICR2ZXJib3NlID0gdmVyYm9zZV9mbGFnICgnVkFM QUMnKTsKICAgbXkgJHNpbGVudCA9IHNpbGVudF9mbGFnICgpOwotICBteSAkc3RhbXBmaWxlID0g IlwkKHNyY2RpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wIjsKKyAgbXkgJHN0YW1wZmlsZSA9ICJc JChidWlsZGRpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wIjsKIAogICAkb3V0cHV0X3J1bGVzIC49 Ci0gICAgIlwkKHNyY2RpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wOiBAdmFsYV9zb3VyY2VzXG4i LgorICAgICJcJChidWlsZGRpcikvJHtkZXJpdmVkfV92YWxhLnN0YW1wOiBAdmFsYV9zb3VyY2Vz XG4iLgogIyBTaW5jZSB0aGUgQyBmaWxlcyBnZW5lcmF0ZWQgZnJvbSB0aGUgdmFsYSBzb3VyY2Vz IGRlcGVuZCBvbiB0aGUKICMgJHtkZXJpdmVkfV92YWxhLnN0YW1wIGZpbGUsIHdlIG11c3QgZW5z dXJlIGl0cyB0aW1lc3RhbXAgaXMgb2xkZXIgdGhhbgogIyB0aG9zZSBvZiB0aGUgQyBmaWxlcyBn ZW5lcmF0ZWQgYnkgdGhlIHZhbGFjIGludm9jYXRpb24gYmVsb3cgKHRoaXMgaXMKQEAgLTU3OTYs NyArNTgxNiw3IEBAIHN1YiBsYW5nX3ZhbGFfZmluaXNoX3RhcmdldAogIyBUaHVzIHdlIG5lZWQg dG8gY3JlYXRlIHRoZSBzdGFtcCBmaWxlICpiZWZvcmUqIGludm9raW5nIHZhbGFjLCBhbmQgdG8K ICMgbW92ZSBpdCB0byBpdHMgZmluYWwgbG9jYXRpb24gb25seSBhZnRlciB2YWxhYyBoYXMgYmVl biBpbnZva2VkLgogICAgICJcdCR7c2lsZW50fXJtIC1mIFwkXEAgJiYgZWNobyBzdGFtcCA+IFwk XEAtdFxuIi4KLSAgICAiXHQke3ZlcmJvc2V9XCQoYW1fX2NkKSBcJChzcmNkaXIpICYmICRjb21w aWxlIEB2YWxhX3NvdXJjZXNcbiIuCisgICAgIlx0JHt2ZXJib3NlfSRjb21waWxlIFwkXlxuIi4K ICAgICAiXHQke3NpbGVudH1tdiAtZiBcJFxALXQgXCRcQFxuIjsKIAogICBwdXNoX2Rpc3RfY29t bW9uICgkc3RhbXBmaWxlKTsKZGlmZiAtLWdpdCBhL3QvbGlzdC1vZi10ZXN0cy5tayBiL3QvbGlz dC1vZi10ZXN0cy5tawppbmRleCBmNDRlZWQwZTUuLjUzNTljMjI0MiAxMDA2NDQKLS0tIGEvdC9s aXN0LW9mLXRlc3RzLm1rCisrKyBiL3QvbGlzdC1vZi10ZXN0cy5tawpAQCAtMTI1Miw2ICsxMjUy LDggQEAgdC92YWxhLWNvbmZpZ3VyZS5zaCBcCiB0L3ZhbGEtZ3JlcHBpbmcuc2ggXAogdC92YWxh LWhlYWRlcnMuc2ggXAogdC92YWxhLWxpYnMuc2ggXAordC92YWxhLWxpYnMtZGlzdGNoZWNrLnNo IFwKK3QvdmFsYS1saWJzLXZwYXRoLnNoIFwKIHQvdmFsYS1taXguc2ggXAogdC92YWxhLW1peDIu c2ggXAogdC92YWxhLW5vbi1yZWN1cnNpdmUtc2V0dXAuc2ggXApkaWZmIC0tZ2l0IGEvdC92YWxh LWxpYnMtZGlzdGNoZWNrLnNoIGIvdC92YWxhLWxpYnMtZGlzdGNoZWNrLnNoCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMC4uOTlmMWU5MDJmCi0tLSAvZGV2L251bGwKKysrIGIv dC92YWxhLWxpYnMtZGlzdGNoZWNrLnNoCkBAIC0wLDAgKzEsMTk2IEBACisjISAvYmluL3NoCisj IENvcHlyaWdodCAoQykgMjAxMi0yMDE2IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgor IworIyBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yIG1vZGlmeQorIyBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorIyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyLCBvciAoYXQgeW91ciBvcHRpb24pCisjIGFueSBsYXRl ciB2ZXJzaW9uLgorIworIyBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUg dGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyMgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRo b3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMgTUVSQ0hBTlRBQklMSVRZIG9yIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQorIyBHTlUgR2VuZXJhbCBQ dWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxkIGhhdmUgcmVj ZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorIyBhbG9uZyB3 aXRoIHRoaXMgcHJvZ3JhbS4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5z ZXMvPi4KKworIyBCdWlsZGluZyBsaWJyYXJpZXMgKGxpYnRvb2wgYW5kIHN0YXRpYykgZnJvbSBW YWxhIHNvdXJjZXMuCisjIEFuZCB1c2Ugb2YgdmFwaSBmaWxlcyB0byBjYWxsIEMgY29kZSBmcm9t IFZhbGEuCisKK3JlcXVpcmVkPSJ2YWxhYyBjYyBwa2ctY29uZmlnIGxpYnRvb2xpemUgR05VbWFr ZSIKK2FtX2NyZWF0ZV90ZXN0ZGlyPWVtcHR5CisuIHRlc3QtaW5pdC5zaAorCitjYXQgPj4gY29u ZmlndXJlLmFjIDw8ICdFTkQnCitBQ19JTklUKFthdGVzdF0sWzAuMV0pCitBQ19DT05GSUdfU1JD RElSKFtkYXRhL2F0ZXN0LnBjLmluXSkKKworQUNfU1VCU1QoW0FQSV9WRVJTSU9OXSxbMF0pCisK K0FNX0lOSVRfQVVUT01BS0UKK0FNX01BSU5UQUlORVJfTU9ERShbZW5hYmxlXSkKKworQUNfUFJP R19DQworQUNfUFJPR19JTlNUQUxMCitBTV9QUk9HX0FSCitQS0dfUFJPR19QS0dfQ09ORklHKFsw LjIyXSkKK0FNX1BST0dfVkFMQUMoWzAuMzJdKQorCitQS0dfQ0hFQ0tfTU9EVUxFUyhBVEVTVCwg W2dpby0yLjBdKQorCitMVF9JTklUCitBQ19DT05GSUdfRklMRVMoWworCU1ha2VmaWxlCisKKwlz cmMvTWFrZWZpbGUKKworCXNyYy9hdGVzdC0kQVBJX1ZFUlNJT04uZGVwczpzcmMvYXRlc3QuZGVw cy5pbgorCisJZGF0YS9NYWtlZmlsZQorCWRhdGEvYXRlc3QtJEFQSV9WRVJTSU9OLnBjOmRhdGEv YXRlc3QucGMuaW4KKworXSxbXSwKK1tBUElfVkVSU0lPTj0nJEFQSV9WRVJTSU9OJ10pCitBQ19P VVRQVVQKK0VORAorCisKK2NhdCA+IE1ha2VmaWxlLmFtIDw8ICdFTkQnCitTVUJESVJTPWRhdGEg c3JjCitFTkQKKworbWtkaXIgZGF0YQorCitjYXQgPiBkYXRhL2F0ZXN0LnBjLmluIDw8ICdFTkQn CitwcmVmaXg9QHByZWZpeEAKK2V4ZWNfcHJlZml4PUBleGVjX3ByZWZpeEAKK2xpYmRpcj1AbGli ZGlyQAorZGF0YXJvb3RkaXI9QGRhdGFyb290ZGlyQAorZGF0YWRpcj1AZGF0YWRpckAKK2luY2x1 ZGVkaXI9QGluY2x1ZGVkaXJACisKK05hbWU6IGF0ZXN0LUBBUElfVkVSU0lPTkAKK0Rlc2NyaXB0 aW9uOiBhdGVzdCBsaWJyYXJ5CitWZXJzaW9uOiBAVkVSU0lPTkAKK1JlcXVpcmVzOiBnbGliLTIu MCBnb2JqZWN0LTIuMAorTGliczogLUwke2xpYmRpcn0gLWxhdGVzdC1AQVBJX1ZFUlNJT05ACitD ZmxhZ3M6IC1JJHtpbmNsdWRlZGlyfS9hdGVzdC1AQVBJX1ZFUlNJT05ACitFTkQKKworCitjYXQg PiBkYXRhL01ha2VmaWxlLmFtIDw8ICdFTkQnCisjIHBrZy1jb25maWcgZGF0YQorIyBOb3RlIHRo YXQgdGhlIHRlbXBsYXRlIGZpbGUgaXMgY2FsbGVkIGF0ZXN0LnBjLmluLCBidXQgZ2VuZXJhdGVz IGEKKyMgdmVyc2lvbmVkIC5wYyBmaWxlIHVzaW5nIHNvbWUgbWFnaWMgaW4gQUNfQ09ORklHX0ZJ TEVTLgorcGtnY29uZmlnZGlyID0gJChsaWJkaXIpL3BrZ2NvbmZpZworcGtnY29uZmlnX0RBVEEg PSBhdGVzdC0kKEFQSV9WRVJTSU9OKS5wYworCitESVNUQ0xFQU5GSUxFUyA9ICQocGtnY29uZmln X0RBVEEpCitFWFRSQV9ESVNUID0gYXRlc3QucGMuaW4KK0VORAorCitta2RpciBzcmMKKworY2F0 ID4gc3JjL2F0ZXN0LmRlcHMuaW4gPDwgJ0VORCcKK2dsaWItMi4wCitFTkQKKworCitjYXQgPiBz cmMvYXRlc3QudmFsYSA8PCAnRU5EJwordXNpbmcgR0xpYjsKKworbmFtZXNwYWNlIEF0ZXN0IHsK KwlwdWJsaWMgY2xhc3MgQSB7CisJCXB1YmxpYyBib29sIGZvbygpIHsgcmV0dXJuIGZhbHNlOyB9 CisJfQorfQorRU5ECisKK2NhdCA+IHNyYy9NYWtlZmlsZS5hbSA8PCAnRU5EJworbGliX0xUTElC UkFSSUVTID0gbGliYXRlc3QtQEFQSV9WRVJTSU9OQC5sYQorCitsaWJhdGVzdF9AQVBJX1ZFUlNJ T05AX2xhX1NPVVJDRVMgPSBcCisJYXRlc3QudmFsYSBcCisJY3NlcnZpY2UuYyBcCisJY3NlcnZp Y2UuaCBcCisJJChOVUxMKQorCisKK2xpYmF0ZXN0X0BBUElfVkVSU0lPTkBfbGFfQ1BQRkxBR1Mg PSBcCisJLURPS09LSU1ERUZJTkVEPTEgXAorCSQoTlVMTCkKKworbGliYXRlc3RfQEFQSV9WRVJT SU9OQF9sYV9DRkxBR1MgPSBcCisJJChBVEVTVF9DRkxBR1MpIFwKKwkkKFdBUk5fQ0ZMQUdTKSBc CisJJChOVUxMKQorCitsaWJhdGVzdF9AQVBJX1ZFUlNJT05AX2xhX0xJQkFERCA9IFwKKwkkKEFU RVNUX0xJQlMpIFwKKwkkKE5VTEwpCisKK2xpYmF0ZXN0X0BBUElfVkVSU0lPTkBfbGFfTERGTEFH UyA9IFwKKwkkKFdBUk5fTERGTEFHUykgXAorCSQoTlVMTCkKKworbGliYXRlc3RfQEFQSV9WRVJT SU9OQF9sYV9WQUxBRkxBR1MgPSBcCisJLS12YXBpZGlyPSQoVkFQSURJUikgXAorCS0tdmFwaWRp cj0kKHNyY2RpcikgXAorCS0tcGtnIGNzZXJ2aWNlIFwKKwktLXRocmVhZCBcCisJLS10YXJnZXQt Z2xpYj0yLjQ0IFwKKwktLXBrZyBnbGliLTIuMCBcCisJLUggYXRlc3QuaCBcCisJLS1saWJyYXJ5 IGF0ZXN0LUBBUElfVkVSU0lPTkAgXAorCSQoTlVMTCkKKworaGVhZGVyX0RBVEE9YXRlc3QuaAor aGVhZGVyZGlyPSQoaW5jbHVkZWRpcikvYXRlc3QtQEFQSV9WRVJTSU9OQC9hdGVzdAorCithdGVz dC1AQVBJX1ZFUlNJT05ALmRlcHM6CisJY3AgYXRlc3QuZGVwcyBhdGVzdC1AQVBJX1ZFUlNJT05A LmRlcHMKKwordmFwaV9EQVRBPWF0ZXN0LUBBUElfVkVSU0lPTkAudmFwaSBhdGVzdC1AQVBJX1ZF UlNJT05ALmRlcHMKK3ZhcGlkaXI9JChWQVBJRElSKQorCitDTEVBTkZJTEVTID0gYXRlc3QtQEFQ SV9WRVJTSU9OQC5kZXBzCitFTkQKKworCitjYXQgPiBzcmMvY3NlcnZpY2UuYyA8PCAnRU5EJwor I2luY2x1ZGUgImNzZXJ2aWNlLmgiCitpbnQgY19zZXJ2aWNlX211X2NhbGwgKHZvaWQpCit7Cisg IHJldHVybiBPS09LSU1ERUZJTkVEOworfQorRU5ECisKK2NhdCA+IHNyYy9jc2VydmljZS5oIDw8 ICdFTkQnCitpbnQgY19zZXJ2aWNlX211ICh2b2lkKTsKK0VORAorCitjYXQgPiBzcmMvY3NlcnZp Y2UudmFwaSA8PCdFTkQnCituYW1lc3BhY2UgQ1NlcnZpY2UgeworICBwdWJsaWMgY2xhc3MgTXUg eworICAgIFtDQ29kZSAoY2hlYWRlcl9maWxlbmFtZSA9ICJjc2VydmljZS5oIiwgY25hbWUgPSAi Y19zZXJ2aWNlX211X2NhbGwiKV0KKyAgICBwdWJsaWMgaW50IGNhbGwgKCk7CisgIH0KK30KK0VO RAorCisKK2xpYnRvb2xpemUKKyRBQ0xPQ0FMCiskQVVUT0NPTkYKKyRBVVRPTUFLRSAtYQorCisu L2NvbmZpZ3VyZQorCiskTUFLRQordGVzdCAtZiBzcmMvbGliYXRlc3RfMF9sYV92YWxhLnN0YW1w Cit0ZXN0IC1mIHNyYy9saWJhdGVzdC0wLmxhCisKKyRNQUtFIGRpc3RjaGVjaworCis6CisKZGlm ZiAtLWdpdCBhL3QvdmFsYS1saWJzLXZwYXRoLnNoIGIvdC92YWxhLWxpYnMtdnBhdGguc2gKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwLi4zMzBjZTIzZjcKLS0tIC9kZXYvbnVs bAorKysgYi90L3ZhbGEtbGlicy12cGF0aC5zaApAQCAtMCwwICsxLDEwOCBAQAorIyEgL2Jpbi9z aAorIyBDb3B5cmlnaHQgKEMpIDIwMTItMjAxNiBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIElu Yy4KKyMKKyMgVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vciBtb2RpZnkKKyMgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2Vu ZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKKyMgdGhlIEZyZWUgU29mdHdhcmUg Rm91bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24gMiwgb3IgKGF0IHlvdXIgb3B0aW9uKQorIyBhbnkg bGF0ZXIgdmVyc2lvbi4KKyMKKyMgVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBo b3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisjIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsg d2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisjIE1FUkNIQU5UQUJJTElUWSBv ciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKKyMgR05VIEdlbmVy YWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyMKKyMgWW91IHNob3VsZCBoYXZl IHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyMgYWxv bmcgd2l0aCB0aGlzIHByb2dyYW0uICBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xp Y2Vuc2VzLz4uCisKKyMgQnVpbGRpbmcgbGlicmFyaWVzIChsaWJ0b29sIGFuZCBzdGF0aWMpIGZy b20gVmFsYSBzb3VyY2VzLgorIyBBbmQgdXNlIG9mIHZhcGkgZmlsZXMgdG8gY2FsbCBDIGNvZGUg ZnJvbSBWYWxhLgorCityZXF1aXJlZD0idmFsYWMgY2MgcGtnLWNvbmZpZyBsaWJ0b29saXplIEdO VW1ha2UiCithbV9jcmVhdGVfdGVzdGRpcj1lbXB0eQorLiB0ZXN0LWluaXQuc2gKKworY2F0ID4+ IGNvbmZpZ3VyZS5hYyA8PCAnRU5EJworQUNfSU5JVChbdmFsYWxpYnNdLFswLjFdKQorCitBQ19D T05GSUdfTUFDUk9fRElSKFttNF0pCisKK0FNX0lOSVRfQVVUT01BS0UKK0FNX1BST0dfQVIKK0xU X0lOSVQKKworQUNfUFJPR19DQworQUNfQ09ORklHX0ZJTEVTKFtNYWtlZmlsZSBzcmMvTWFrZWZp bGVdKQorCitBTV9QUk9HX1ZBTEFDKFswLjcuM10pCitQS0dfQ0hFQ0tfTU9EVUxFUyhbR09CSkVD VF0sIFtnb2JqZWN0LTIuMCA+PSAyLjRdKQorCitBQ19PVVRQVVQKK0VORAorCisKK2NhdCA+IE1h a2VmaWxlLmFtIDw8ICdFTkQnCitTVUJESVJTPXNyYworRU5ECisKK21rZGlyIHNyYworCitjYXQg PiBzcmMvTWFrZWZpbGUuYW0gPDwgJ0VORCcKK0FVVE9NQUtFX09QVElPTlMgPSBzdWJkaXItb2Jq ZWN0cworbGliX0xUTElCUkFSSUVTID0gbGlic2VydmljZS5sYQorbGlic2VydmljZV9sYV9TT1VS Q0VTID0gc2VydmljZS52YWxhIGNzZXJ2aWNlLmMgY3NlcnZpY2UuaAorbGlic2VydmljZV9sYV9D UFBGTEFHUyA9IC1ET0tPS0lNREVGSU5FRD0xCitsaWJzZXJ2aWNlX2xhX1ZBTEFGTEFHUyA9IC0t dmFwaWRpcj0kKHNyY2RpcikgLS1wa2cgY3NlcnZpY2UgLS1saWJyYXJ5IHNlcnZpY2UKK0FNX0NG TEFHUyA9ICQoR09CSkVDVF9DRkxBR1MpCitFTkQKKworbGlidG9vbGl6ZQorJEFDTE9DQUwKKyRB VVRPQ09ORgorJEFVVE9NQUtFIC1hCisKK2NhdCA+IHNyYy9jc2VydmljZS5jIDw8ICdFTkQnCisj aW5jbHVkZSAiY3NlcnZpY2UuaCIKK2ludCBjX3NlcnZpY2VfbXVfY2FsbCAodm9pZCkKK3sKKyAg cmV0dXJuIE9LT0tJTURFRklORUQ7Cit9CitFTkQKKworY2F0ID4gc3JjL2NzZXJ2aWNlLmggPDwg J0VORCcKK2ludCBjX3NlcnZpY2VfbXUgKHZvaWQpOworRU5ECisKK2NhdCA+IHNyYy9jc2Vydmlj ZS52YXBpIDw8J0VORCcKK25hbWVzcGFjZSBDU2VydmljZSB7CisgIHB1YmxpYyBjbGFzcyBNdSB7 CisgICAgW0NDb2RlIChjaGVhZGVyX2ZpbGVuYW1lID0gImNzZXJ2aWNlLmgiLCBjbmFtZSA9ICJj X3NlcnZpY2VfbXVfY2FsbCIpXQorICAgIHB1YmxpYyBpbnQgY2FsbCAoKTsKKyAgfQorfQorRU5E CisKK2NhdCA+IHNyYy9zZXJ2aWNlLnZhbGEgPDwgJ0VORCcKK25hbWVzcGFjZSBDU2VydmljZSB7 CitwdWJsaWMgY2xhc3MgR2VuZXJhdG9yIDogT2JqZWN0IHsKKwlwdWJsaWMgR2VuZXJhdG9yICgp IHsKKwkJc3Rkb3V0LnByaW50ZiAoImNvbnN0cnVjdCBnZW5lcmF0b3IiKTsKKwl9CisJcHVibGlj IHZvaWQgaW5pdCAoKSB7CisJCXN0ZG91dC5wcmludGYgKCJpbml0IGdlbmVyYXRvciIpOworCX0K K30KK30KK0VORAorCitta2RpciBidWlsZAorY2QgYnVpbGQKKy4uL2NvbmZpZ3VyZQorCiskTUFL RQorcHdkCit0ZXN0IC1mIHNyYy9saWJzZXJ2aWNlX2xhX3ZhbGEuc3RhbXAKK3Rlc3QgLWYgc3Jj L2xpYnNlcnZpY2UubGEKKworCis6CisKZGlmZiAtLWdpdCBhL3QvdmFsYS1saWJzLnNoIGIvdC92 YWxhLWxpYnMuc2gKaW5kZXggNzdkMTk3MWJjLi45YmQ4YTRhMmMgMTAwNjQ0Ci0tLSBhL3QvdmFs YS1saWJzLnNoCisrKyBiL3QvdmFsYS1saWJzLnNoCkBAIC0zMiwxMSArMzIsMTEgQEAgRU5ECiAK IGNhdCA+IE1ha2VmaWxlLmFtIDw8ICdFTkQnCiBBVVRPTUFLRV9PUFRJT05TID0gc3ViZGlyLW9i amVjdHMKLWxpYl9MSUJSQVJJRVMgPSBsaWJtdS5hCitsaWJfTElCUkFSSUVTID0gbGlic2Vydmlj ZS5hCiBsaWJfTFRMSUJSQVJJRVMgPSBzcmMvbGliemFyZG96LmxhCi1saWJtdV9hX1NPVVJDRVMg PSBtdS52YWxhIG11Mi5jIG11LnZhcGkgbXUyLmgKLWxpYm11X2FfQ1BQRkxBR1MgPSAtRE9LT0tJ TURFRklORUQ9MQotbGlibXVfYV9WQUxBRkxBR1MgPSAtLXZhcGlkaXI9JChzcmNkaXIpCitsaWJz ZXJ2aWNlX2FfU09VUkNFUyA9IHNlcnZpY2UudmFsYSBjc2VydmljZS5jIGNzZXJ2aWNlLmgKK2xp YnNlcnZpY2VfYV9DUFBGTEFHUyA9IC1ET0tPS0lNREVGSU5FRD0xCitsaWJzZXJ2aWNlX2FfVkFM QUZMQUdTID0gLS12YXBpZGlyPSQoc3JjZGlyKSAtLXBrZyBjc2VydmljZSAtLWxpYnJhcnkgc2Vy dmljZQogQU1fQ0ZMQUdTID0gJChHT0JKRUNUX0NGTEFHUykKIHNyY19saWJ6YXJkb3pfbGFfTElC QUREID0gJChHT0JKRUNUX0xJQlMpCiBzcmNfbGliemFyZG96X2xhX1NPVVJDRVMgPSBzcmMvemFy ZG96LWZvby52YWxhIHNyYy96YXJkb3otYmFyLnZhbGEKQEAgLTUxLDI4ICs1MSwzNyBAQCAkQVVU T01BS0UgLWEKIAogLi9jb25maWd1cmUKIAotY2F0ID4gbXUyLmMgPDwgJ0VORCcKLSNpbmNsdWRl ICJtdTIuaCIKLWludCBtdTIgKHZvaWQpCitjYXQgPiBjc2VydmljZS5jIDw8ICdFTkQnCisjaW5j bHVkZSAiY3NlcnZpY2UuaCIKK2ludCBjX3NlcnZpY2VfbXVfY2FsbCAodm9pZCkKIHsKICAgcmV0 dXJuIE9LT0tJTURFRklORUQ7CiB9CiBFTkQKIAotY2F0ID4gbXUyLmggPDwgJ0VORCcKLWludCBt dTIgKHZvaWQpOworY2F0ID4gY3NlcnZpY2UuaCA8PCAnRU5EJworaW50IGNfc2VydmljZV9tdSAo dm9pZCk7CiBFTkQKIAotY2F0ID4gbXUudmFwaSA8PCdFTkQnCi1bQ0NvZGUgKGNoZWFkZXJfZmls ZW5hbWUgPSAibXUyLmgiLCBjbmFtZSA9ICJtdTIiKV0KLXB1YmxpYyBpbnQgY19tdTIgKCk7Citj YXQgPiBjc2VydmljZS52YXBpIDw8J0VORCcKK25hbWVzcGFjZSBDU2VydmljZSB7CisgIHB1Ymxp YyBjbGFzcyBNdSB7CisgICAgW0NDb2RlIChjaGVhZGVyX2ZpbGVuYW1lID0gImNzZXJ2aWNlLmgi LCBjbmFtZSA9ICJjX3NlcnZpY2VfbXVfY2FsbCIpXQorICAgIHB1YmxpYyBpbnQgY2FsbCAoKTsK KyAgfQorfQogRU5ECiAKLWNhdCA+IG11LnZhbGEgPDwgJ0VORCcKLWludCBtYWluICgpCi17Ci0g IHN0ZG91dC5wcmludGYgKCJtdW11bXVcbiIpOwotICByZXR1cm4gY19tdTIgKCk7CitjYXQgPiBz ZXJ2aWNlLnZhbGEgPDwgJ0VORCcKK25hbWVzcGFjZSBDU2VydmljZSB7CitwdWJsaWMgY2xhc3Mg R2VuZXJhdG9yIDogT2JqZWN0IHsKKwlwdWJsaWMgR2VuZXJhdG9yICgpIHsKKwkJc3Rkb3V0LnBy aW50ZiAoImNvbnN0cnVjdCBnZW5lcmF0b3IiKTsKKwl9CisJcHVibGljIHZvaWQgaW5pdCAoKSB7 CisJCXN0ZG91dC5wcmludGYgKCJpbml0IGdlbmVyYXRvciIpOworCX0KK30KIH0KIEVORAogCkBA IC04NywxMiArOTYsMTIgQEAgcHVibGljIGNsYXNzIEZvbyB7CiBFTkQKIAogJE1BS0UKLXRlc3Qg LWYgbGlibXUuYQordGVzdCAtZiBsaWJzZXJ2aWNlLmEKIHRlc3QgLWYgc3JjL2xpYnphcmRvei5s YQotJEZHUkVQICJtdW11bXUiIG11LmMKKyRGR1JFUCAiY29uc3RydWN0IGdlbmVyYXRvciIgc2Vy dmljZS5jCiAkRkdSRVAgIkZvb0Zvb0ZvbyIgc3JjL3phcmRvei1mb28uYwogJEZHUkVQICJCYXJC YXJCYXIiIHNyYy96YXJkb3otYmFyLmMKLXRlc3QgLWYgbGlibXVfYV92YWxhLnN0YW1wCit0ZXN0 IC1mIGxpYnNlcnZpY2VfYV92YWxhLnN0YW1wCiB0ZXN0IC1mIHNyY19saWJ6YXJkb3pfbGFfdmFs YS5zdGFtcAogCiAkTUFLRSBkaXN0Y2hlY2sKZGlmZiAtLWdpdCBhL3QvdmFsYS1ub24tcmVjdXJz aXZlLXNldHVwLnNoIGIvdC92YWxhLW5vbi1yZWN1cnNpdmUtc2V0dXAuc2gKaW5kZXggNWZhMThk NGY1Li44MTEzZTQ3MWMgMTAwNjQ0Ci0tLSBhL3QvdmFsYS1ub24tcmVjdXJzaXZlLXNldHVwLnNo CisrKyBiL3QvdmFsYS1ub24tcmVjdXJzaXZlLXNldHVwLnNoCkBAIC04Niw3ICs4Niw4IEBAICRB VVRPTUFLRSAtYQogLi9jb25maWd1cmUgfHwgc2tpcF8gImNvbmZpZ3VyZSBmYWlsdXJlIgogJE1B S0UKICRNQUtFIGRpc3RjaGVjawotJE1BS0UgZGlzdGNsZWFuCiskTUFLRSBtYWludGFpbmVyLWNs ZWFuCisKIG1rZGlyIGJ1aWxkCiBjZCBidWlsZAogLi4vY29uZmlndXJlCmRpZmYgLS1naXQgYS90 L3ZhbGEtcGFyYWxsZWwuc2ggYi90L3ZhbGEtcGFyYWxsZWwuc2gKaW5kZXggNGY5M2Y4OTcwLi44 YzAxMjU1MmUgMTAwNjQ0Ci0tLSBhL3QvdmFsYS1wYXJhbGxlbC5zaAorKysgYi90L3ZhbGEtcGFy YWxsZWwuc2gKQEAgLTY0LDggKzY0LDggQEAgY2QgYnVpbGQKIC4uL2NvbmZpZ3VyZQogJE1BS0Ug LWo2CiBscyAtbCAuIC4uICMgRm9yIGRlYnVnZ2luZy4KLWZvciB4IGluIG1haW4gMSAyIDMgNCA1 IDY7IGRvIHRlc3QgLWYgLi4vJHguYzsgZG9uZQotdGVzdCAtZiAuLi96YXJkb3pfdmFsYS5zdGFt cAorZm9yIHggaW4gbWFpbiAxIDIgMyA0IDUgNjsgZG8gdGVzdCAtZiAkeC5jOyBkb25lCit0ZXN0 IC1mIC4vemFyZG96X3ZhbGEuc3RhbXAKIAogJE1BS0UgZGlzdGNoZWNrIC1qNAogCmRpZmYgLS1n aXQgYS90L3ZhbGEtcGVyLXRhcmdldC1mbGFncy5zaCBiL3QvdmFsYS1wZXItdGFyZ2V0LWZsYWdz LnNoCmluZGV4IDcxNWVkNzc2OC4uZTM3ZmU2MGQ4IDEwMDY0NAotLS0gYS90L3ZhbGEtcGVyLXRh cmdldC1mbGFncy5zaAorKysgYi90L3ZhbGEtcGVyLXRhcmdldC1mbGFncy5zaApAQCAtODYsOCAr ODYsOCBAQCB0ZXN0IC1mIHNyYy94Zm9vLmMKIHRlc3QgLWYgc3JjL3hiYXIuYwogCiAkTUFLRSBk aXN0Y2xlYW4KLXRlc3QgLWYgc3JjL3hmb28uYwotdGVzdCAtZiBzcmMveGJhci5jCit0ZXN0ICEg LWUgc3JjL3hmb28uYwordGVzdCAhIC1lIHNyYy94YmFyLmMKIAogIyBSZS1jcmVhdGUgTWFrZWZp bGUuCiBtdiBjb25maWcuc2F2IGNvbmZpZy5zdGF0dXMKZGlmZiAtLWdpdCBhL3QvdmFsYS1yZWN1 cnNpdmUtc2V0dXAuc2ggYi90L3ZhbGEtcmVjdXJzaXZlLXNldHVwLnNoCmluZGV4IDQwYjg3MDEx OS4uODA4ZjViOThhIDEwMDY0NAotLS0gYS90L3ZhbGEtcmVjdXJzaXZlLXNldHVwLnNoCisrKyBi L3QvdmFsYS1yZWN1cnNpdmUtc2V0dXAuc2gKQEAgLTc3LDkgKzc3LDkgQEAgZ3JlcCAnYW0tLWVy cm9yJyBzcmMvemFyZG96LltjaF0gJiYgZXhpdCAxCiAjIENoZWNrIHRoZSBkaXN0cmlidXRpb24u CiAKICRNQUtFIGRpc3RjaGVjawotJE1BS0UgZGlzdGNsZWFuCiskTUFLRSBtYWludGFpbmVyLWNs ZWFuCiAKLSMgVHJ1IGEgVlBBVEggc2V0dXAuCisjIFRyeSBhIFZQQVRIIHNldHVwLgogCiBta2Rp ciBidWlsZAogY2QgYnVpbGQKQEAgLTg5LDE5ICs4OSwxOSBAQCAkTUFLRSBkaXN0Y2hlY2sKIAog IyBUZXN0IHJlYnVpbGQgcnVsZXMgZnJvbSBidWlsZGRpci4KIAotcm0gLWYgLi4vc3JjL3phcmRv ei5oCi0kTUFLRSAtQyBzcmMgLi4vLi4vc3JjL3phcmRvei5oCi10ZXN0IC1mIC4uL3NyYy96YXJk b3ouaAorcm0gc3JjL3phcmRvei5oCiskTUFLRSAtQyBzcmMgemFyZG96LmgKK3Rlc3QgLWYgc3Jj L3phcmRvei5oCiAKLXJtIC1mIC4uL3NyYy96YXJkb3ouYworcm0gLWYgc3JjL3phcmRvei5jCiAk TUFLRQotZ3JlcCAnWmFyZG96IScgLi4vc3JjL3phcmRvei5jCitncmVwICdaYXJkb3ohJyBzcmMv emFyZG96LmMKIAogJHNsZWVwCiBzZWQgJ3MvWmFyZG96IS9Gb29CYXIhLycgLi4vc3JjL3phcmRv ei52YWxhID4gdAogbXYgLWYgdCAuLi9zcmMvemFyZG96LnZhbGEKICRNQUtFCi1ncmVwICdGb29C YXIhJyAuLi9zcmMvemFyZG96LmMKLWdyZXAgJ1phcmRveiEnIC4uL3NyYy96YXJkb3ouYyAmJiBl eGl0IDEKK2dyZXAgJ0Zvb0JhciEnIHNyYy96YXJkb3ouYworZ3JlcCAnWmFyZG96IScgc3JjL3ph cmRvei5jICYmIGV4aXQgMQogCiA6CmRpZmYgLS1naXQgYS90L3ZhbGEtdnBhdGguc2ggYi90L3Zh bGEtdnBhdGguc2gKaW5kZXggYmMxMGFiOWJhLi5kM2QwZmYxMzUgMTAwNjQ0Ci0tLSBhL3QvdmFs YS12cGF0aC5zaAorKysgYi90L3ZhbGEtdnBhdGguc2gKQEAgLTQ3LDE2ICs0NywxNiBAQCBjcCBo ZWxsby52YWxhIGdvb2RieWUudmFsYQogCiAkQUNMT0NBTAogJEFVVE9DT05GCi0kQVVUT01BS0UK KyRBVVRPTUFLRSAtYQogCiBta2RpciBidWlsZAogY2QgYnVpbGQKIC4uL2NvbmZpZ3VyZQogJE1B S0UKLXRlc3QgLWYgLi4vZm9vX3ZhbGEuc3RhbXAKLXRlc3QgLWYgLi4vYmFyX3ZhbGEuc3RhbXAK LWdyZXAgZm9vZm9vZm9vIC4uL2hlbGxvLmMKLXRlc3QgLWYgLi4vemFyZG96LmgKK3Rlc3QgLWYg Li9mb29fdmFsYS5zdGFtcAordGVzdCAtZiAuL2Jhcl92YWxhLnN0YW1wCitncmVwIGZvb2Zvb2Zv byAuL2hlbGxvLmMKK3Rlc3QgLWYgLi96YXJkb3ouaAogJE1BS0UgZGlzdGNoZWNrCiAKICMgUmVi dWlsZCBydWxlcyB3b3JrIGFsc28gaW4gVlBBVEggYnVpbGRzLgpAQCAtNzAsOSArNzAsMTAgQEAg aW50IG1haW4gKCkKIEVORAogCiAkTUFLRQotdGVzdCAtZiAuLi9mb29fdmFsYS5zdGFtcAotdGVz dCAtZiAuLi9iYXJfdmFsYS5zdGFtcAotZ3JlcCBiYXJiYXJiYXIgLi4vaGVsbG8uYwordGVzdCAt ZiAuL2Zvb192YWxhLnN0YW1wCit0ZXN0IC1mIC4vYmFyX3ZhbGEuc3RhbXAKK2dyZXAgYmFyYmFy YmFyIC4vaGVsbG8uYworJE1BS0UgZGlzdGNoZWNrCiAKICMgUmVidWlsZCBydWxlcyBhcmUgbm90 IHVzZWxlc3NseSB0cmlnZ2VyZWQuCiAkTUFLRSAtcQpAQCAtODAsMTQgKzgxLDE0IEBAICRNQUtF IC1uIHwgZ3JlcCAnXC5zdGFtcCcgJiYgZXhpdCAxCiAKICMgQ2xlYW51cCBydWxlcyB3b3JrIGFs c28gaW4gVlBBVEggYnVpbGRzLgogJE1BS0UgY2xlYW4KLXRlc3QgLWYgLi4vZm9vX3ZhbGEuc3Rh bXAKLXRlc3QgLWYgLi4vYmFyX3ZhbGEuc3RhbXAKLXRlc3QgLWYgLi4vemFyZG96LmgKLXRlc3Qg LWYgLi4vaGVsbG8uYwordGVzdCAtZiAuL2Zvb192YWxhLnN0YW1wCit0ZXN0IC1mIC4vYmFyX3Zh bGEuc3RhbXAKK3Rlc3QgLWYgLi96YXJkb3ouaAordGVzdCAtZiAuL2hlbGxvLmMKICRNQUtFIG1h aW50YWluZXItY2xlYW4KLXRlc3QgISAtZSAuLi96YXJkb3ouaAotdGVzdCAhIC1lIC4uL2hlbGxv LmMKLXRlc3QgISAtZSAuLi9mb29fdmFsYS5zdGFtcAotdGVzdCAhIC1lIC4uL2Jhcl92YWxhLnN0 YW1wCit0ZXN0ICEgLWUgLi96YXJkb3ouaAordGVzdCAhIC1lIC4vaGVsbG8uYwordGVzdCAhIC1l IC4vZm9vX3ZhbGEuc3RhbXAKK3Rlc3QgISAtZSAuL2Jhcl92YWxhLnN0YW1wCiAKIDoKLS0gCjIu MjUuMQoK --00000000000066be5405b2be87c3-- From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 28 16:37:50 2020 Received: (at 13002) by debbugs.gnu.org; 28 Oct 2020 20:37:50 +0000 Received: from localhost ([127.0.0.1]:50883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXsCc-0000Ib-LH for submit@debbugs.gnu.org; Wed, 28 Oct 2020 16:37:50 -0400 Received: from freefriends.org ([96.88.95.60]:38092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXsCa-0000IS-PL for 13002@debbugs.gnu.org; Wed, 28 Oct 2020 16:37:49 -0400 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (freefriends.org [96.88.95.60]) by freefriends.org (8.14.7/8.14.7) with ESMTP id 09SKblMT028000 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Oct 2020 14:37:48 -0600 Received: (from apache@localhost) by freefriends.org (8.14.7/8.14.7/Submit) id 09SKbk98027999; Wed, 28 Oct 2020 14:37:46 -0600 Date: Wed, 28 Oct 2020 14:37:46 -0600 Message-Id: <202010282037.09SKbk98027999@freefriends.org> From: Karl Berry To: rrt@sc3d.org Subject: Re: bug#13002: Updated, fixed patch In-Reply-To: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Reuben - thanks for all your work on this. (And again to Daniel for the initial patch.) 2. Remove the support for distributing Vala projects as C files that do not require a Vala compiler. The Vala compiler is portable and has much the same dependencies as most Vala projects (that is, a C compiler and glib). As I wrote before, I strongly support this approach. Since the C file is derived, don't distribute it. Would that simplify the patch? Jim or Paul or anyone, if you object (?!), please speak ... --thanks, karl. From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 28 18:56:34 2020 Received: (at 13002) by debbugs.gnu.org; 28 Oct 2020 22:56:34 +0000 Received: from localhost ([127.0.0.1]:51097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXuMr-0003ne-VX for submit@debbugs.gnu.org; Wed, 28 Oct 2020 18:56:34 -0400 Received: from mail-oi1-f182.google.com ([209.85.167.182]:40828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXuMp-0003nP-5X for 13002@debbugs.gnu.org; Wed, 28 Oct 2020 18:56:32 -0400 Received: by mail-oi1-f182.google.com with SMTP id m128so1296298oig.7 for <13002@debbugs.gnu.org>; Wed, 28 Oct 2020 15:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mvoC2eltz6epo4ZntJwkNwocKVwSkLozRCBJJkK8PmE=; b=zKID1rMYSIYlNLvPOF+J1znZwmtrPBA8n2Tf6Sr33VWvcfn2N7FKH0wGTtUfyuhFDl aYWdncWffo92fcPi4FEmyu8D3Rn+1jSt9aRAzWc1GF9GAUNv7X7nl77R6fOlgblOgYlJ 3OXXsF3ELzNOwI1DJpuwW+aR6g5g+/2nnyx4Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mvoC2eltz6epo4ZntJwkNwocKVwSkLozRCBJJkK8PmE=; b=WRMEZKMotTegVA9mafSRB2xEAgF7SgoGK8M5lx6aahudxkINaASEpunnF7SLhLZBnW PgPeS7+2qJYAKldE2h2gyWhDoo7n/5xI6LZXIhVZRzhjHZRDbiJaAHQQ3kcf7vpxe1AS LmcDUGoIcfTwb0FPW64pUufEwosg1E3i71gdNppqDwXp5yIFj9ua1otK7Ecb5Dx7KKlx P27dezUpwh+EUXo9ccXNVT6AnIgy3yvH5oKSVeLiGifPYK03uFYuqY52VA7XaJ8enIuu tz6Nu8m5SIcg7m4FZx+Ua87ASVq7l1q5HI82SumcCiC8pLLQ+A4tJ5FARDP+rLsq9ZzP akEQ== X-Gm-Message-State: AOAM530uVZP8x5P3UoG5Lnthlc9TSObI+fhbH+4ThZPP/STk70N1ztjE eI113PKV5BfpcVYx+T+HvzEx7laDzzuIkoGVzodKpg== X-Google-Smtp-Source: ABdhPJxssZZzXmtutaoTj7Rkov1qc+Ee7diBtoz0q5nwI4UAidmwACPBHC7UlLD03GER8xmFe3bp+LFr+AbllWjd21Q= X-Received: by 2002:aca:a9c8:: with SMTP id s191mr867197oie.11.1603925785292; Wed, 28 Oct 2020 15:56:25 -0700 (PDT) MIME-Version: 1.0 References: <202010282037.09SKbk98027999@freefriends.org> In-Reply-To: <202010282037.09SKbk98027999@freefriends.org> From: Reuben Thomas Date: Wed, 28 Oct 2020 22:56:13 +0000 Message-ID: Subject: Re: bug#13002: Updated, fixed patch To: Karl Berry Content-Type: multipart/alternative; boundary="000000000000adc78005b2c31225" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000adc78005b2c31225 Content-Type: text/plain; charset="UTF-8" On Wed, 28 Oct 2020 at 20:37, Karl Berry wrote: > > As I wrote before, I strongly support this approach. Since the C file is > derived, don't distribute it. Would that simplify the patch? > A patch to re-do Vala support would be a larger patch at this stage, though overall it would certainly streamline Vala support in automake. Also, being frank, removing "Vala-generated-C" support is the only way I would offer to have anything to do with making such a patch, as (as far as I can see) that route would be much simpler than retaining the current support (even in deprecated form) while also putting in "normal" Vala compiler support. I also sympathise with the maintainers if they would rather not simply remove the existing C-from-Vala support. I would offer the following observation, though: as far as I can tell, most Vala developers are migrating away from autotools (if they used it) to meson, along with the rest of the GNOME ecosystem. Also, it's fairly straightforward to get old versions of automake where needed. This could be used to argue in either direction: on the one hand, replacing the current Vala support with "normal" support would annoy a small proportion (committed automake users) of a small user group (Vala programmers). On the other, it would benefit few users. It might be best then to make the decision based on automake's other users? I for one would not be terribly happy as an automake maintainer at having to keep Vala support working long-term, and to be honest, the patch I have submitted, while fixing bugs in Vala support, will slightly add to the maintenance burden. My own use case is that I've rewritten GNU Zile (a small Emacs clone) in Vala. Users building it will have to install glib anyway, and so while it feels nice that they don't need a Vala compiler, as I said before, I don't think in practice it's a big deal (even for a Zile user who doesn't care about Vala, they're likely to be able to install valac easily using whatever package manager they have). -- https://rrt.sc3d.org --000000000000adc78005b2c31225 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Wed, 28 Oct 2020 at= 20:37, Karl Berry <karl@freefri= ends.org> wrote:

As I wrote before, I strongly support this approach. Since the C file is derived, don't distribute it. Would that simplify the patch?

A patch to re-do Vala support = would be a larger patch at this stage, though overall it would certainly st= reamline Vala support in automake.

Also, being frank, removing "Vala-generated-C" suppo= rt is the only way I would offer to have anything to do with making such a = patch, as (as far as I can see) that route would be much simpler than retai= ning the current support (even in deprecated form) while also putting in &q= uot;normal" Vala compiler support.

<= div style=3D"font-family:arial,helvetica,sans-serif;font-size:small" class= =3D"gmail_default">I also sympathise with the maintainers if they would rat= her not simply remove the existing C-from-Vala support. I would offer the f= ollowing observation, though: as far as I can tell, most Vala developers ar= e migrating away from autotools (if they used it) to meson, along with the = rest of the GNOME ecosystem. Also, it's fairly straightforward to get o= ld versions of automake where needed. This could be used to argue in either= direction: on the one hand, replacing the current Vala support with "= normal" support would annoy a small proportion (committed automake use= rs) of a small user group (Vala programmers). On the other, it would benefi= t few users.

It might = be best then to make the decision based on automake's other users? I fo= r one would not be terribly happy as an automake maintainer at having to ke= ep Vala support working long-term, and to be honest, the patch I have submi= tted, while fixing bugs in Vala support, will slightly add to the maintenan= ce burden.

My own use = case is that I've rewritten GNU Zile (a small Emacs clone) in Vala. Use= rs building it will have to install glib anyway, and so while it feels nice= that they don't need a Vala compiler, as I said before, I don't th= ink in practice it's a big deal (even for a Zile user who doesn't c= are about Vala, they're likely to be able to install valac easily using= whatever package manager they have).
=C2=A0
--
--000000000000adc78005b2c31225-- From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 28 18:58:28 2020 Received: (at 13002) by debbugs.gnu.org; 28 Oct 2020 22:58:28 +0000 Received: from localhost ([127.0.0.1]:51109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXuOh-0003qx-Qs for submit@debbugs.gnu.org; Wed, 28 Oct 2020 18:58:28 -0400 Received: from mail-ot1-f43.google.com ([209.85.210.43]:40537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXuOg-0003qL-9J for 13002@debbugs.gnu.org; Wed, 28 Oct 2020 18:58:26 -0400 Received: by mail-ot1-f43.google.com with SMTP id f97so678560otb.7 for <13002@debbugs.gnu.org>; Wed, 28 Oct 2020 15:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xG2k/ZVBsventR68fDsuGpBuuJXncWR39+6KunDXo7w=; b=Vo4XEsAKbhLa7LkinW1a10N2fC5RKdicj4NIFzgpx+A0SjIt2X+29Ic01tgeeKjS6Z vK8ejAQ9zdE8hW3Apa1vPD2OEkMmS2+9fjALH/DpClwxJv/W9Bt0XSVbKtvPWLKSBacc yr/sMUrbAGTf/5i49tN3oblKen+pI4/LCePU0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xG2k/ZVBsventR68fDsuGpBuuJXncWR39+6KunDXo7w=; b=CdqDLFGxXHuk91AfNkxwcJONq3vodda/X9HdlTXa1FjseGIvy/TNjLImRprOHg/mP3 yLtkfBTfmNoJI75TGimjO1AoRymXOwEgjiKoopkdMLcv0v2hlfcO/sG4+xAuhcKaXEdZ SiBKTIsU66ouxUlkxIbehX5jLh5vpLPi9v+Y9wMJUEqN+FlnHeE56184QtFXABfG6fH7 Oh13YtB615b1cE3+hcVNnOHgSXR5BAdaYpO29AOYq29huGgMOOG0nQ2PB9lc3GsrI4Qb +w5pIoW9H2zIFlLMglcQ4FPSveNRgegndtQniDUDDH09Zxnxv8+Ayht6UyDvWk05gf/v aKJQ== X-Gm-Message-State: AOAM532T6dzUBmGens+y0pkdKwjeDWNf5KwRkVAJ6XtFUfRhi3G4WGC/ AFLbMataJzq9fE3Kx3nnrMoVZMJMN5E3TJcNuA4/Vw== X-Google-Smtp-Source: ABdhPJzP4DQkZq1h2msNJMrWFLq99w2DFYCce89eFVFtkJhoYPl4rEpqDCvT2+PEt7hNdZG123cUIJ1AfrGtDbav5gQ= X-Received: by 2002:a9d:7586:: with SMTP id s6mr1175344otk.46.1603925900561; Wed, 28 Oct 2020 15:58:20 -0700 (PDT) MIME-Version: 1.0 References: <202010282037.09SKbk98027999@freefriends.org> In-Reply-To: From: Reuben Thomas Date: Wed, 28 Oct 2020 22:58:09 +0000 Message-ID: Subject: Re: bug#13002: Updated, fixed patch To: Karl Berry Content-Type: multipart/alternative; boundary="0000000000008ca9cc05b2c319b8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --0000000000008ca9cc05b2c319b8 Content-Type: text/plain; charset="UTF-8" To follow up clearly: if it were up to me, I'd install an acceptable version of my patch, as it improves the status quo, and include it in the next release. Then I'd think about whether it's possible to redo the Vala support entirely. -- https://rrt.sc3d.org --0000000000008ca9cc05b2c319b8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
To follow up clearly: if it were up to = me, I'd install an acceptable version of my patch, as it improves the s= tatus quo, and include it in the next release. Then I'd think about whe= ther it's possible to redo the Vala support entirely.

-- <= br>
--0000000000008ca9cc05b2c319b8-- From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 29 21:45:34 2020 Received: (at 13002) by debbugs.gnu.org; 30 Oct 2020 01:45:34 +0000 Received: from localhost ([127.0.0.1]:55579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYJTu-0006Qs-5U for submit@debbugs.gnu.org; Thu, 29 Oct 2020 21:45:34 -0400 Received: from freefriends.org ([96.88.95.60]:58242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYJTr-0006Qk-Qp for 13002@debbugs.gnu.org; Thu, 29 Oct 2020 21:45:28 -0400 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (freefriends.org [96.88.95.60]) by freefriends.org (8.14.7/8.14.7) with ESMTP id 09U1jQfX001989 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Oct 2020 19:45:26 -0600 Received: (from apache@localhost) by freefriends.org (8.14.7/8.14.7/Submit) id 09U1jPEU001988; Thu, 29 Oct 2020 19:45:25 -0600 Date: Thu, 29 Oct 2020 19:45:25 -0600 Message-Id: <202010300145.09U1jPEU001988@freefriends.org> From: Karl Berry To: rrt@sc3d.org Subject: Re: bug#13002: Updated, fixed patch In-Reply-To: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) install an acceptable version of my patch, as it improves the status quo, and include it in the next release. Then I'd think about whether it's possible to redo the Vala support entirely. Sounds sensible. I applied your change, but when running make distcheck (not make check) the new vala-libs-distcheck.sh test fails. Does that happen for you? Most of the other vala tests are skipped, with the message: vala-libs-vpath: skipped test: pkg-config m4 macros not found I don't see anything especially different in vala-libs-distcheck than the others. vala-libs-vpath has exactly the same list of required= programs and it is skipped. The failure output is: ./configure: line 4032: syntax error near unexpected token `0.22' ./configure: line 4032: `PKG_PROG_PKG_CONFIG(0.22)' which is expected, but clearly it shouldn't be getting to that point if it can't find pkg.m4. (I think make distcheck sets up an environment where any system pkg.m4, among others, will not be found.) I note that this is the only call to any PKG_ macro other than PKG_CHECK_MODULES, although I don't see why that should matter. I'll try to pursue further tomorrow/soon, but thought I'd report now and see if you get the same ... --thanks, karl. From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 01 17:55:23 2020 Received: (at 13002) by debbugs.gnu.org; 1 Nov 2020 22:55:23 +0000 Received: from localhost ([127.0.0.1]:38921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZMFv-0000U9-4J for submit@debbugs.gnu.org; Sun, 01 Nov 2020 17:55:23 -0500 Received: from mail-oi1-f179.google.com ([209.85.167.179]:46774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZMFp-0000Tq-D6 for 13002@debbugs.gnu.org; Sun, 01 Nov 2020 17:55:21 -0500 Received: by mail-oi1-f179.google.com with SMTP id x1so12837035oic.13 for <13002@debbugs.gnu.org>; Sun, 01 Nov 2020 14:55:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sc3d.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9Vlzvm2Ihe4QsLdXvZgcAAMftOGMmiALwfgm7tLpPi0=; b=F2ZH/qC+bNCQ4Scd+DWAhUdPyhqJfYIfYomcZDyYtnzmMDjjG2pBgVMTZ6cgrZgvlZ uErbwXpO+pmotQdxUInFtNJqtzae/EkWX2hpcBkxCyTm/eozAExKQOAzN36cftcrdc7N 06KVyBD0LprV7uwZ0xh8kgGxkJyvXqx+Vl1hw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9Vlzvm2Ihe4QsLdXvZgcAAMftOGMmiALwfgm7tLpPi0=; b=axLLPkaA5FU/fy97cauuZCL2MeydgmSgD8UcHZTnMyvkee/tCO4CD5kyamXWvLylwJ s9nmEibL+uG8fSVB5WGEnHeKHy+wfbBzNwODbyuNJSXMax74Eo/hmDznmQNdA5ZrEe7P 9NJ6TXIO9BJS6K7iSbnYvykaF6zIbB5r0AlOCa22ksoAPxXvILBs3vhZlWifueBY8Ucm skSqvJGnt9XciDg1Etf8i9z6grDL3fWsIv0Ny2snAkKUsxv1EVMDVtijN+xTFxbtkuEN t8TVvGiOcAPz/FXNbgoibQ2rAck+q8YoxRBNeq5JwDVMrV3R55FYEASWyAZzaBJx+pmC np/Q== X-Gm-Message-State: AOAM532rRJjqxANh2hB01iTLfr6ANHK/Qr4lTfIe1Pt0sRO7ydHFDxxD rmXE6XRczpjlRANKmFN80OQzJbPydNqCqtNyRgJIIKgEcGc= X-Google-Smtp-Source: ABdhPJzlV3ca5fjwSIoBBOYDUrDCbR8raqMgPXCY5v0lGJg2XcX6bRwnN9Ixo0UW1ikR74Upxy0lbraO/fGjEBaSVdc= X-Received: by 2002:aca:a9c8:: with SMTP id s191mr7963257oie.11.1604271311578; Sun, 01 Nov 2020 14:55:11 -0800 (PST) MIME-Version: 1.0 References: <202010300145.09U1jPEU001988@freefriends.org> In-Reply-To: <202010300145.09U1jPEU001988@freefriends.org> From: Reuben Thomas Date: Sun, 1 Nov 2020 22:55:00 +0000 Message-ID: Subject: Re: bug#13002: Updated, fixed patch To: Karl Berry Content-Type: multipart/alternative; boundary="000000000000a67fcd05b313856b" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000a67fcd05b313856b Content-Type: text/plain; charset="UTF-8" On Fri, 30 Oct 2020 at 01:45, Karl Berry wrote: > install an acceptable version of my patch, as it improves the status > quo, and include it in the next release. Then I'd think about > whether it's possible to redo the Vala support entirely. > > Sounds sensible. > > I applied your change, but when running make distcheck (not make check) > the new vala-libs-distcheck.sh test fails. Does that happen for you? > I get no errors. Most of the other vala tests are skipped, with the message: > vala-libs-vpath: skipped test: pkg-config m4 macros not found > I do not get these errors or skips: all the vala tests are run, and pass. I confirm that I ran "make distcheck". -- https://rrt.sc3d.org --000000000000a67fcd05b313856b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, 30 Oct 2020 at 01:45, Karl Berry <karl@freefriends.org> wrote:
=C2=A0 =C2=A0 install an acceptable ve= rsion of my patch, as it improves the status
=C2=A0 =C2=A0 quo, and include it in the next release. Then I'd think a= bout
=C2=A0 =C2=A0 whether it's possible to redo the Vala support entirely.<= br>
Sounds sensible.

I applied your change, but when running make distcheck (not make check) the new vala-libs-distcheck.sh test fails. Does that happen for you?

I get no errors.

=
Most of the other vala tests are skipped, with the message:
vala-libs-vpath: skipped test: pkg-config m4 macros not found

I do not get these errors or skip= s: all the vala tests are run, and pass.

=
I confirm that I ran "make distcheck".

--
--000000000000a67fcd05b313856b-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 07 21:45:24 2020 Received: (at 13002) by debbugs.gnu.org; 8 Nov 2020 02:45:24 +0000 Received: from localhost ([127.0.0.1]:59535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbaho-00007v-Gn for submit@debbugs.gnu.org; Sat, 07 Nov 2020 21:45:24 -0500 Received: from freefriends.org ([96.88.95.60]:33218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbahm-00007i-H1; Sat, 07 Nov 2020 21:45:22 -0500 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (freefriends.org [96.88.95.60]) by freefriends.org (8.14.7/8.14.7) with ESMTP id 0A82jK4C016588 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 7 Nov 2020 19:45:21 -0700 Received: (from apache@localhost) by freefriends.org (8.14.7/8.14.7/Submit) id 0A82jKGQ016587; Sat, 7 Nov 2020 19:45:20 -0700 Date: Sat, 7 Nov 2020 19:45:20 -0700 Message-Id: <202011080245.0A82jKGQ016587@freefriends.org> From: Karl Berry To: rrt@sc3d.org Subject: Re: bug#13002: Updated, fixed patch In-Reply-To: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 13002 Cc: 13002@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) I have taken Daniel Espinosa's patch and improved it so that it fixes all the test failures. Reuben, thank you very much for dealing with everything, and thanks to Daniel for the original work. make check && make distcheck are working for me now. I have pushed the changes (with fingers crossed) and am closing this bug. -k From unknown Fri Jun 20 20:00:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 06 Dec 2020 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator