From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 8 Nov 2022 19:28:08 +0000 (-0700)
Subject: Fix eln files not being generated by native-comp-async
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~75
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9015757e57573e9085e8e07fe2bb9a9c056b415f;p=emacs.git

Fix eln files not being generated by native-comp-async

Add 0012-Fix-eln-files-not-being-generated-when-native-comp-a.patch to
fix the problem.  Thanks to Youhei SASAKI and Tatsuya Kinoshita for
reporting the problem and indicating the upstream fix to backport.

Closes: #1023440
---

9015757e57573e9085e8e07fe2bb9a9c056b415f
diff --cc debian/.git-dpm
index d37afb18234,00000000000..9b9caeea264
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 65845dea9568b38a45bca7fbcc0e41e2b21e5c1f
- 65845dea9568b38a45bca7fbcc0e41e2b21e5c1f
++376678555b3b216784b61a0a2f2088f416c4e336
++376678555b3b216784b61a0a2f2088f416c4e336
 +279b82e64e15b5e2df3cb522636c6db85a8ee659
 +279b82e64e15b5e2df3cb522636c6db85a8ee659
 +emacs_28.2+1.orig.tar.xz
 +d7f49858bdec2d47110c2ed7b1d0005f157e20c3
 +26988304
diff --cc debian/patches/0012-Fix-eln-files-not-being-generated-when-native-comp-a.patch
index 00000000000,00000000000..f21e84a5e71
new file mode 100644
--- /dev/null
+++ b/debian/patches/0012-Fix-eln-files-not-being-generated-when-native-comp-a.patch
@@@ -1,0 -1,0 +1,40 @@@
++From 376678555b3b216784b61a0a2f2088f416c4e336 Mon Sep 17 00:00:00 2001
++From: Andrea Corallo <akrl@sdf.org>
++Date: Wed, 19 Oct 2022 22:08:41 +0200
++Subject: Fix eln files not being generated when native-comp-async runs
++
++This upstream patch has been incorporated to fix the problem:
++
++  * Fix async native compilation (bug#58637)
++
++  * lisp/emacs-lisp/comp.el (comp--native-compile): Fix gate condition.
++  (comp-run-async-workers): Add assetion.
++
++Origin: upstream, commit: 56c63ca21b3e5e2d0bb05d3897ea287a754c5b29
++Bug-Debian: https://bugs.debian.org/1023440
++Forwarded: not-needed
++---
++ lisp/emacs-lisp/comp.el | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
++index fb0d3805da4..8a3429c9b67 100644
++--- a/lisp/emacs-lisp/comp.el
+++++ b/lisp/emacs-lisp/comp.el
++@@ -3916,6 +3916,7 @@ comp-run-async-workers
++   "Start compiling files from `comp-files-queue' asynchronously.
++ When compilation is finished, run `native-comp-async-all-done-hook' and
++ display a message."
+++  (cl-assert (null comp-no-spawn))
++   (if (or comp-files-queue
++           (> (comp-async-runnings) 0))
++       (unless (>= (comp-async-runnings) (comp-effective-async-max-jobs))
++@@ -4022,7 +4023,7 @@ comp--native-compile
++               (stringp function-or-file))
++     (signal 'native-compiler-error
++             (list "Not a function symbol or file" function-or-file)))
++-  (unless comp-no-spawn
+++  (when (or (null comp-no-spawn) comp-async-compilation)
++     (catch 'no-native-compile
++       (let* ((data function-or-file)
++              (comp-native-compiling t)
diff --cc debian/patches/series
index e876e14c5b9,00000000000..5ea4b1d538d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,12 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch
 +0010-Avoid-fork-bomb-caused-by-native-compilation.patch
 +0011-Avoid-fork-bomb-caused-by-native-compilation-trampol.patch
++0012-Fix-eln-files-not-being-generated-when-native-comp-a.patch