GNU bug report logs - #76690
[PATCH emacs-team 0/4] Emacs build fixes + enable native comp by default?

Previous Next

Full log

View this message in rfc822 format

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
To: 76690 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>, Andrew Tropin <andrew <at> trop.in>, Divya Ranjan Pattanaik <divya <at> subvertising.org>, Ian Eure <ian <at> retrospec.tv>, Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [bug#76690] [PATCH 1/4] gnu: emacs->emacs-next: Don't use file that doesn't exist
Date: Sun,  2 Mar 2025 16:04:56 -0500

* gnu/packages/emacs.scm(emacs->emacs-next): Remove reference to deleted file
'comp-integrity-next.el'.  It will now use the inherited phase that refers to
an existing file.

Change-Id: Iea026528d2293538ab6d89e02d8d8a2a86fa0f1d
---
 gnu/packages/emacs.scm | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 5de87720b4..deebb7282d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -607,28 +607,7 @@ (define* (emacs->emacs-next emacs #:optional name
                                   (string-drop (package-name emacs)
                                                (string-length "emacs"))))))
     (version version)
-    (source source)
-    (arguments
-     (substitute-keyword-arguments (package-arguments emacs)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'validate-comp-integrity
-              (lambda* (#:key outputs #:allow-other-keys)
-                #$(cond
-                   ((%current-target-system)
-                    #~(display
-                       "Cannot validate native compilation on cross builds.\n"))
-                   ((member (%current-system) '("armhf-linux" "i686-linux"))
-                    #~(display "Integrity test is broken on 32 bit systems.\n"))
-                   (else
-                    #~(invoke
-                       (string-append (assoc-ref outputs "out") "/bin/emacs")
-                       "--batch"
-                       "--load"
-                       #$(local-file
-                          (search-auxiliary-file
-                           "emacs/comp-integrity-next.el"))
-                       "-f" "ert-run-tests-batch-and-exit")))))))))))
+    (source source)))
 
 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
-- 
2.48.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.