From patchwork Sat Mar 2 15:56:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 61304 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0D45B27BBEA; Sun, 3 Mar 2024 06:22:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8A70227BBE2 for ; Sun, 3 Mar 2024 06:22:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgfE7-00011Y-Ez; Sun, 03 Mar 2024 01:21:35 -0500 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 1rgfE5-0000wz-Ks for guix-patches@gnu.org; Sun, 03 Mar 2024 01:21:33 -0500 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 1rgfE5-0005fw-CM for guix-patches@gnu.org; Sun, 03 Mar 2024 01:21:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgfEY-0008Ne-0a; Sun, 03 Mar 2024 01:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible. 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, guix-patches@gnu.org Resent-Date: Sun, 03 Mar 2024 06:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69510 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69510@debbugs.gnu.org Cc: Mekeor Melire , 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 69510-submit@debbugs.gnu.org id=B69510.170944691232184 (code B ref 69510); Sun, 03 Mar 2024 06:22:01 +0000 Received: (at 69510) by debbugs.gnu.org; 3 Mar 2024 06:21:52 +0000 Received: from localhost ([127.0.0.1]:39646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgfEN-0008N2-Tp for submit@debbugs.gnu.org; Sun, 03 Mar 2024 01:21:52 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:48522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgfEL-0008Mk-8V for 69510@debbugs.gnu.org; Sun, 03 Mar 2024 01:21:50 -0500 Received: by mail-lj1-f195.google.com with SMTP id 38308e7fff4ca-2d180d6bd32so40594511fa.1 for <69510@debbugs.gnu.org>; Sat, 02 Mar 2024 22:21:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709446814; x=1710051614; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=flasg1YSM3sqVpJG0oFMYnNxhYXEXfL4s1V28vZ0ArQ=; b=ZPGWx07R2ekmoFqb99p89kBHLsw56XQUlhO7sR+cqz5/ztXIXwXfbGwJSHsWrMd/aX 6lKiyGhjGouYxgsb4gOrbYKWePEdgh/5t784BDe297t2WtlxNTgtXaDEk34PjdpxDRKF Elk4ypldLASAcrnnlW3QF7fC1mOhofa09QzYkhYM2uKgmYres50OtLg5VQbUZXnyVjm4 CF2CtJe0L0c7DqH4JiTtlzAcVHWDyd0DxwpHmndBSehCt1phi07rVMzaXEXQEJmbFZMj W7ltk4sN3FRkAIuDwy4EZwUvvR8FgqiuVEZzlyNy0DV/VHwmHhnBaQODJhWnBteqS+5l dVmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709446814; x=1710051614; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=flasg1YSM3sqVpJG0oFMYnNxhYXEXfL4s1V28vZ0ArQ=; b=YlqSRtj8P7WdTZeQWZCU5/PFABDTxprRcRYVd9J12SJwCDQadFXN8GsrjPQaHYg1MZ 8K6DnSMsSHKD0OZl1NJI7+W1mo/fyoh4ugWvqsbX3s1yE2+F0SgWK+42DoF9qBKLXnLS cXgt9IlRAptb4KaVnHCc9en0KGSgW+G/CMKeZAxGpCrNt49/yFi9nexad/6g8HUBylRM ENXFah82dHbb4Y5sefVyyButzXPOROc6sdlIMK6iJ8CNp4Axa+ZExsxE+65ytZptYimH ES/KXj7Ya6uPTHk0OkdQj7iSzb2/y+UmWxhRgoU0cm0ijPrKHAYBf+cOR4K9Nu5zjUfz 5Utg== X-Gm-Message-State: AOJu0YzzWs4Ni6/L8zvFrzGn4PloHgBPLiHOXetzPVF7XAPzSmyd27GV nHKuZk/REkvR8mBeTTW68tgt2JuRfv2qzQfkeDFph37x+EungVJ8rJPZ5dMG3jE= X-Google-Smtp-Source: AGHT+IHpOMtoAVVTe7fyzDWaLyh6PV6jBpXx8APDmvx76nnjvGphoPcZtcVxS2itDQ8dad6dNXAAWA== X-Received: by 2002:a05:6512:488a:b0:513:f34:3f1c with SMTP id eq10-20020a056512488a00b005130f343f1cmr3718675lfb.27.1709446814140; Sat, 02 Mar 2024 22:20:14 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id le6-20020a170906ae0600b00a449b4f4aefsm2114238ejb.178.2024.03.02.22.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 22:20:13 -0800 (PST) Message-ID: <7f3f70eedbbec74481a0ca9fea4c19250961685e.1709446767.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 2 Mar 2024 16:56:13 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Newer (development) builds of Emacs 30 mark a number of functions related to native compilation as ‘internal’. Since we rely on such functions and there does not appear to be a high-level replacement at the moment, let's work around this case. * guix/build/emacs-utils.scm (emacs-compile-directory): Require comp early and check if ‘comp-write-bytecode-file’ is available. Fixes: Upstream renamed comp-write-bytecode-file --- guix/build/emacs-utils.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index eca42bf305..aeb364133a 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -136,7 +136,14 @@ (define* (emacs-compile-directory dir) (emacs-batch-eval `(let ((byte-compile-debug t) ; for proper exit status (byte+native-compile (native-comp-available-p)) - (files (directory-files-recursively ,dir "\\.el$"))) + (files (directory-files-recursively ,dir "\\.el$")) + (write-bytecode + (and (native-comp-available-p) + (progn + (require 'comp) + (if (fboundp 'comp-write-bytecode-file) + 'comp-write-bytecode-file + 'comp--write-bytecode-file))))) (mapc (lambda (file) (let (byte-to-native-output-buffer-file @@ -152,7 +159,7 @@ (define* (emacs-compile-directory dir) (byte-compile-file file)) ;; After native compilation, write the bytecode file. (unless (null byte-to-native-output-buffer-file) - (comp-write-bytecode-file nil)))) + (funcall write-bytecode nil)))) files)) #:dynamic? #t))