From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IB5xLegdkmbHIgEAqHPOHw:P1 (envelope-from ) for ; Sat, 13 Jul 2024 06:25:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id IB5xLegdkmbHIgEAqHPOHw (envelope-from ) for ; Sat, 13 Jul 2024 08:25:44 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WWXR20QI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720851944; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=rzT0ktuRybzWkerTTdymR6w7XDoxWKyopOHlVZSjuTU=; b=N2bIgd+YuDNkjanNSnqCmBhzqcX9JuM3m9opsi3JBlQQxZhySbFvKG8VGDOzUO8MHNrrIQ A3TFW2WrWWDc59JlDaANsEmWSe71G0CCugmrL1fauglMZ7ihG/8nXS/YaQpFsPZjD5twAp Lm3JIOIro6+MI4b8sLO2VHBZYNKSEuXHhsY0BBpnl5R5GnulCn9kc6ZfQ6rYFteoVFnbER u00FQ1hAufk4tAsVOlDqfQcBFsWNetC15m508ZILto6z5HjqMzIA2c4rOqtHWvjtYpG7vO vbjtGb9tZ6JN5jZMzB0txZiziVpyiZFduOJMHH8+vTeccx24XfFrcLJXXrMc+Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720851944; a=rsa-sha256; cv=none; b=QcZhzryCXyDdyUzbuiOlqhN8xfbsO+4CLpv/TdhnB5q49sc7hjnLfAFPHnQ1wDynKyM0gn sVm3UhI4ABpFMzLOW+L8DWpGz7FNXTkwYUdeLmNwzyQ3VrqDpbJym5atyRn2TCUCcme8KV ip1NUKMaY9hLih+TaRYynQOELgxyIKAdk3Wg0ZvnxDvMr6Xve9mn+xQBEKRNc78J9rPBlw C75rv+vOWZR1MeL4fouRXeJV/zPdkV1hmsSzanG6tW+4I7rPrAgCUGh+sQSSUGgvBiPmQF NGcYpakbA2nC2b8oihwQi1XlqBgtJ0HVCuqPRLaVbigN2Kb0Iz8UcSfIZ6sSCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WWXR20QI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 544E36A406 for ; Sat, 13 Jul 2024 08:25:44 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSVtV-0005w7-Qm; Sat, 13 Jul 2024 02:06:05 -0400 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 1sSVtU-0005uy-7L for bug-guix@gnu.org; Sat, 13 Jul 2024 02:06:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSVtS-00038O-1w for bug-guix@gnu.org; Sat, 13 Jul 2024 02:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSVtS-0006Xo-CP; Sat, 13 Jul 2024 02:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#72045: [PATCH RFC 1/2] gnu: emacs: Compute ABI hash and native version dir without version. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, bug-guix@gnu.org Resent-Date: Sat, 13 Jul 2024 06:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72045 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 72045@debbugs.gnu.org Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 72045-submit@debbugs.gnu.org id=B72045.172085075425135 (code B ref 72045); Sat, 13 Jul 2024 06:06:02 +0000 Received: (at 72045) by debbugs.gnu.org; 13 Jul 2024 06:05:54 +0000 Received: from localhost ([127.0.0.1]:54984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSVtK-0006XK-9X for submit@debbugs.gnu.org; Sat, 13 Jul 2024 02:05:54 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:47371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSVtG-0006Wy-GE for 72045@debbugs.gnu.org; Sat, 13 Jul 2024 02:05:52 -0400 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a7523f0870cso308350666b.3 for <72045@debbugs.gnu.org>; Fri, 12 Jul 2024 23:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720850684; x=1721455484; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=rzT0ktuRybzWkerTTdymR6w7XDoxWKyopOHlVZSjuTU=; b=WWXR20QId4wr5AIoGagtdOInxMMzElk7g7DRDQA2wCh0Rg3DeDyYsTA1obmjlQxaOF Y85Y9Y55cnuzaVCa3ZV7yDWzxii2bb8pLved+f2rG+b2jFIEkAzHd2WDkrv2jGm8pDCe aThphjtF1kjoobMqYzaoDVYPim01qz5AbQkBz061AgovzKFlfW4UF0AQPLTSgVkjmHDJ 0uMGEGYo3LjKaC1FllRJpvrbRFL8oo0aENcNjKdqpYbCS2XCqBFIAwg+8VEY5iXhwxAC I+GOagL2PffTRgiMyzx97wh1Uq+c2Du0X3w2A82Xziw6ppgPncark3OuAR/gpsVFaLkQ h58g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720850684; x=1721455484; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rzT0ktuRybzWkerTTdymR6w7XDoxWKyopOHlVZSjuTU=; b=AUKMp6NZqOC0SbRntucw/hKhO/+KUxJInxK/xCURrDNA9/Mr9MlkvWFGAx9+SJsdCA C6Vp/MbjvGGRr1os4dj86btW/Jhvs2iRF04SvqQeks4JOL3r45pU3VVnNWDZszuc53Sg Ymy6EgkS+rHEWHNkYshcaPB+/oz5mqT6y0TDe+6k3mJrWi3xEZuIZlNQ92ljUZBF0TiU FejZNLt4lsFyWgDr9G3xIfKiYtbI9tLFDEj9E/+2BS8kqF4p7REmoOT1CIAvvEBJxMcH eqZWQ43L5sTNyLVpix4hQHUBQWiGyKOOQHY1QNzLXu+WgPWcpKmc/18dnhCvE1j9HLAP Wa+A== X-Gm-Message-State: AOJu0YxcwNRVrYJxZgzM9f5R8MNfbPaI72hJuqMum6bKDRciuXgRb0kv MoFfkPTlCJ3yNSA/InYCnk5akMvYmcdo5iIvhcihEAsA9hNJFwOK1b2zTsu1 X-Google-Smtp-Source: AGHT+IHPi/O8vJJLadzVwysUVM3LG9dvvBmPGzz1B7iv5rXa27wRG+wx27rVrd2PRp+vx/+NEfB2+w== X-Received: by 2002:a17:906:c154:b0:a77:cf09:9c71 with SMTP id a640c23a62f3a-a780b6fd82cmr1112797066b.34.1720850681369; Fri, 12 Jul 2024 23:04:41 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a79bc7f1e5asm21053466b.109.2024.07.12.23.04.40 for <72045@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 23:04:40 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Sat, 13 Jul 2024 07:49:06 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 544E36A406 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -0.30 X-Spam-Score: -0.30 X-TUID: EnPPTRoxSKqh * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: Drop emacs_version from Vcomp_abi_hash. Make Vcomp_native_version_dir equal to Vcomp_abi_hash. --- Hi Guix, this is a somewhat experimental patch, which reduces Vcomp_native_version_dir to simply Vcomp_abi_hash. Note, that this is not enough to address the issues currently noticed with Emacs native compilation, as Vcomp_abi_hash is unstable between 29.3 and 29.4. These hashes are probably unlikely to stay the same between minor releases even when dropping the version. Cheers .../emacs-native-comp-fix-filenames.patch | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch index 169323f290..6c81d7c28c 100644 --- a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -12,11 +12,30 @@ way into the actual variable despite attempts to remove it by calling The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as packages may require it, but only pushes the new value now. -Index: emacs-29.2/src/comp.c +Index: emacs-29.3/src/comp.c =================================================================== ---- emacs-29.2.orig/src/comp.c -+++ emacs-29.2/src/comp.c -@@ -4396,26 +4396,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc +--- emacs-29.3.orig/src/comp.c ++++ emacs-29.3/src/comp.c +@@ -805,7 +805,7 @@ hash_native_abi (void) + Vcomp_abi_hash = + comp_hash_string ( + concat3 (build_string (ABI_VERSION), +- concat3 (Vemacs_version, Vsystem_configuration, ++ concat2 (Vsystem_configuration, + Vsystem_configuration_options), + Fmapconcat (intern_c_string ("comp--subr-signature"), + Vcomp_subr_list, build_string ("")))); +@@ -835,8 +835,7 @@ hash_native_abi (void) + } + #endif + +- Vcomp_native_version_dir = +- concat3 (version, build_string ("-"), Vcomp_abi_hash); ++ Vcomp_native_version_dir = Vcomp_abi_hash; + } + + static void +@@ -4396,26 +4395,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc Scomp_el_to_eln_rel_filename, 1, 1, 0, doc: /* Return the relative name of the .eln file for FILENAME. FILENAME must exist, and if it's a symlink, the target must exist. base-commit: a1e6ac72fd88faf20c26e235f5c8222881b2b450 -- 2.45.2