From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: MinGW build on master broken by Gnulib update Date: Thu, 5 Sep 2024 09:28:15 -0700 Organization: UCLA Computer Science Department Message-ID: <1b42ff1a-1e11-4d09-a4e2-0b51ceef5b85@cs.ucla.edu> References: <86y1464pvo.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------gyvVMt7fyrF0MMN1qsy7ZkRa" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21578"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: emacs-devel@gnu.org, Po Lu To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Sep 05 18:28:51 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1smFLm-0005QA-Lh for ged-emacs-devel@m.gmane-mx.org; Thu, 05 Sep 2024 18:28:51 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smFLL-0006vQ-2J; Thu, 05 Sep 2024 12:28:23 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smFLJ-0006oK-K0 for emacs-devel@gnu.org; Thu, 05 Sep 2024 12:28:21 -0400 Original-Received: from mail.cs.ucla.edu ([131.179.128.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smFLG-0008VB-L0; Thu, 05 Sep 2024 12:28:21 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id B7A4D3C011BDE; Thu, 5 Sep 2024 09:28:16 -0700 (PDT) Original-Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP id giKmEmCaY2oB; Thu, 5 Sep 2024 09:28:15 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 7B2633C01FA16; Thu, 5 Sep 2024 09:28:15 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 7B2633C01FA16 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1725553695; bh=FATnQex5zbCepxPF/P+u0xk3JOBNvbtnjSc5vCO0rb8=; h=Message-ID:Date:MIME-Version:To:From; b=CO715FqWafGtLdazPVTWoLLbxsKwqLIto6bB9u7NG3uw3cCaaTbtYr3jEP/dxGmPq dlZoL5HR3wt6V7+Vy9leCjqO7WNVZxtHawNGIrq8pe8h+opWpJSVJrwoktWvNXn/IB pN3VogVYNE1xJgOYK78u3n0WfzM0kUm1Z/dhMir84Vo7EKCLdYO7pgF92pQwCF8cDu FDjtcbRK/5cCXvEck8M5+eZuR9ghOQk1KmKkQLENZfg7eNa/y4DLNvqISSwUvMHUPL LifWW617Fmv4Dy1Oq8I+wTmZEORXOZ3z/Nx5LAyHd0VOyDK1lO9oXkwdrAY1R2zs8v ZgvNYzPnaSCew== X-Virus-Scanned: amavis at mail.cs.ucla.edu Original-Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id pX00LQDXL5af; Thu, 5 Sep 2024 09:28:15 -0700 (PDT) Original-Received: from [192.168.254.12] (unknown [47.150.137.250]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id 5ACCF3C011BDE; Thu, 5 Sep 2024 09:28:15 -0700 (PDT) Content-Language: en-US In-Reply-To: <86y1464pvo.fsf@gnu.org> Received-SPF: pass client-ip=131.179.128.66; envelope-from=eggert@cs.ucla.edu; helo=mail.cs.ucla.edu X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:323413 Archived-At: This is a multi-part message in MIME format. --------------gyvVMt7fyrF0MMN1qsy7ZkRa Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2024-09-04 22:43, Eli Zaretskii wrote: > Gnulib moved the prototypes of sig2str and str2sig from sig2str.h to > Gnulib's signal.h, evidently assuming that a build which uses the > Gnulib sig2str will also use the Gnulib signal.h header, but that > assumption is false for the MinGW build of Emacs, which omits > lib/signal.h (because it clashes with some w32 code in Emacs). > > I fixed that temporarily by modifying lib/sig2str.h to include the > missing stuff for MinGW, but this is really a Gnulib issue, and should > be fixed in Gnulib, IMO. The change to Gnulib was to align with POSIX.1-2024, which declares sig2str and str2sig in ; see: https://pubs.opengroup.org/onlinepubs/9799919799/functions/sig2str.html We don't want sig2str callers to depart from the POSIX API, any more than we'd want to require (say) fdopen callers to include a Gnulib-specific fdopen.h rather than including . Instead, how about adjusting Emacs's MinGW shims to supply the missing declarations? Something like the attached patch, say. (I don't use MinGW so can't easily test this.) --------------gyvVMt7fyrF0MMN1qsy7ZkRa Content-Type: text/x-patch; charset=UTF-8; name="0001-Move-MinGW-sig2str-workaround-into-ms-w32.h.patch" Content-Disposition: attachment; filename="0001-Move-MinGW-sig2str-workaround-into-ms-w32.h.patch" Content-Transfer-Encoding: base64 RnJvbSAwYzE3YTM0Y2RmYmFiODZiNGI0NGVhMmIxMjNmNmQwNzJlMDBhYjc5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUaHUsIDUgU2VwIDIwMjQgMDk6MjI6NDEgLTA3MDAKU3ViamVjdDogW1BBVENI XSBNb3ZlIE1pbkdXIHNpZzJzdHIgd29ya2Fyb3VuZCBpbnRvIG1zLXczMi5oCgoqIGxpYi9z aWcyc3RyLmg6IEdvIGJhY2sgdG8gc3luY2luZyBleGFjdGx5IHdpdGggR251bGliLgoqIG50 L2luYy9tcy13MzIuaCAoU0lHMlNUUl9NQVgpOiBOZXcgbWFjcm8uCihzaWcyc3RyLCBzdHIy c2lnKTogTmV3IGRlY2xzLgotLS0KIGxpYi9zaWcyc3RyLmggICB8IDIwIC0tLS0tLS0tLS0t LS0tLS0tLS0tCiBudC9pbmMvbXMtdzMyLmggfCAgNyArKysrKysrCiAyIGZpbGVzIGNoYW5n ZWQsIDcgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGli L3NpZzJzdHIuaCBiL2xpYi9zaWcyc3RyLmgKaW5kZXggNjJiNmQ2MjhmMTIuLjFhYmRiMTQw ZTVhIDEwMDY0NAotLS0gYS9saWIvc2lnMnN0ci5oCisrKyBiL2xpYi9zaWcyc3RyLmgKQEAg LTE3LDI4ICsxNyw4IEBACiAKIC8qIFdyaXR0ZW4gYnkgUGF1bCBFZ2dlcnQuICAqLwogCi0v KiBUaGlzIGZpbGUgdXNlcyBIQVZFXyogbWFjcm9zLiAgKi8KLSMgaWYgIV9HTF9DT05GSUdf SF9JTkNMVURFRAotIyAgZXJyb3IgIlBsZWFzZSBpbmNsdWRlIGNvbmZpZy5oIGZpcnN0LiIK LSMgZW5kaWYKLQogI2luY2x1ZGUgPHNpZ25hbC5oPgogCi0vKiBNYXhpbXVtIHNpemUgb2Yg YSBzaWduYWwgbmFtZSByZXR1cm5lZCBieSBzaWcyc3RyKCksIGluY2x1ZGluZyB0aGUKLSAg IHRlcm1pbmF0aW5nIE5VTCBieXRlLiAgKi8KLSNpZm5kZWYgU0lHMlNUUl9NQVgKLS8qIFRo ZSBsb25nZXN0IG9uZTogIlJUTUFYIiwgdGhlbiAiKyIgb3IgIi0iLCB0aGVuIHVwIHRvIDEw IGRpZ2l0cywgdGhlbiBOVUwuCi0gICBBZGQgKyAyIGFzIGEgcmVzZXJ2ZSBmb3IgdGhlIGZ1 dHVyZS4gICovCi0jIGRlZmluZSBTSUcyU1RSX01BWCAoNSArIDEgKyAxMCArIDEgKyAyKQot I2VuZGlmCi0KLSNpZmRlZiBfX01JTkdXMzJfXwotaW50IHNpZzJzdHIgKGludCwgY2hhciAq KTsKLSNlbmRpZgotI2lmZGVmIF9fTUlOR1czMl9fCi1pbnQgc3RyMnNpZyAoY2hhciBjb25z dCAqLCBpbnQgKik7Ci0jZW5kaWYKLQogLyogQW4gdXBwZXIgYm91bmQgb24gc2lnbmFsIG51 bWJlcnMgYWxsb3dlZCBieSB0aGUgc3lzdGVtLiAgKi8KIAogI2lmIGRlZmluZWQgX3N5c19u c2lnCmRpZmYgLS1naXQgYS9udC9pbmMvbXMtdzMyLmggYi9udC9pbmMvbXMtdzMyLmgKaW5k ZXggNzIxMmU0ZDI5ODQuLjU1MjczY2JjZTc5IDEwMDY0NAotLS0gYS9udC9pbmMvbXMtdzMy LmgKKysrIGIvbnQvaW5jL21zLXczMi5oCkBAIC00MjcsNiArNDI3LDEzIEBAICNkZWZpbmUg U0lHX0JMT0NLICAgICAgIDEKICNkZWZpbmUgU0lHX1NFVE1BU0sgICAgIDIKICNkZWZpbmUg U0lHX1VOQkxPQ0sgICAgIDMKIAorLyogTWF4aW11bSBzaXplIG9mIGEgc2lnbmFsIG5hbWUg cmV0dXJuZWQgYnkgc2lnMnN0cigpLCBpbmNsdWRpbmcgdGhlCisgICB0ZXJtaW5hdGluZyBO VUwgYnl0ZS4gIFRoZSBsb25nZXN0IG9uZTogIlJUTUFYIiwgdGhlbiAiKyIgb3IgIi0iLAor ICAgdGhlbiB1cCB0byAxMCBkaWdpdHMsIHRoZW4gTlVMLiAgQWRkICsgMiBhcyBhIHJlc2Vy dmUgZm9yIHRoZSBmdXR1cmUuICAqLworI2RlZmluZSBTSUcyU1RSX01BWCAoNSArIDEgKyAx MCArIDEgKyAyKQorCitleHRlcm4gaW50IHNpZzJzdHIgKGludCwgY2hhciAqKTsKK2V4dGVy biBpbnQgc3RyMnNpZyAoY2hhciBjb25zdCAqLCBpbnQgKik7CiBleHRlcm4gaW50IHNpZ2Vt cHR5c2V0IChzaWdzZXRfdCAqKTsKIGV4dGVybiBpbnQgc2lnYWRkc2V0IChzaWdzZXRfdCAq LCBpbnQpOwogZXh0ZXJuIGludCBzaWdmaWxsc2V0IChzaWdzZXRfdCAqKTsKLS0gCjIuNDMu MAoK --------------gyvVMt7fyrF0MMN1qsy7ZkRa--