Bug 914609

Summary:	app-editors/emacs-29.1-r4[jit] - patch -p1 failed with /var/tmp/portage/app-editors/emacs-29.1-r4/work/patch/05_all_small-ja-dic.patch
Product:	Gentoo Linux	Reporter:	Toralf Förster <toralf>
Component:	Current packages	Assignee:	GNU Emacs project <gnu-emacs>
Status:	RESOLVED FIXED
Severity:	normal	CC:	sam
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---
Attachments:	emerge-info.txt app-editors:emacs-29.1-r4:20230924-170201.log emerge-history.txt environment etc.portage.tar.xz temp.tar.xz

Description Toralf Förster gentoo-dev

2023-09-24 17:40:16 UTC

|+++ b/lisp/leim/ja-dic/ja-dic.elc
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
 [ !! ]
 * ERROR: app-editors/emacs-29.1-r4::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/app-editors/emacs-29.1-r4/work/patch/05_all_small-ja-dic.patch
 * 
 * Call stack:

  -------------------------------------------------------------------

  This is an unstable amd64 chroot image at a tinderbox (==build bot)
  name: 17.1_systemd-20230924-084510

  -------------------------------------------------------------------

gcc-config -l:
 [1] x86_64-pc-linux-gnu-13 *
clang/llvm (if any):
Python 3.11.5
Available Ruby profiles:
  [1]   ruby31 (with Rubygems) *
Available Rust versions:
  [1]   rust-1.72.0 *
php cli (if any):

  HEAD of ::gentoo
commit ba06cdec1b0d8dd21e4bd68eb06e250d6007cf4c
Author: Repository mirror & CI <repomirrorci@gentoo.org>
Date:   Sun Sep 24 16:31:39 2023 +0000

    2023-09-24 16:31:39 UTC

emerge -qpvO app-editors/emacs
[ebuild  N    ] app-editors/emacs-29.1-r4  USE="X acl gmp inotify jit ssl systemd threads xpm zlib -Xaw3d -alsa (-aqua) -athena -cairo -dbus -dynamic-loading -games -gfile -gif -gpm -gsettings -gtk -gui -gzip-el -harfbuzz -imagemagick -jpeg -json -kerberos -lcms -libxml2 -livecd -m17n-lib -mailutils -motif -png (-selinux) -small-ja-dic -sound -source -sqlite -svg -tiff -toolkit-scroll-bars -tree-sitter (-valgrind) -webp -wide-int -xft -xwidgets"

Comment 1 Toralf Förster gentoo-dev

2023-09-24 17:40:17 UTC

Created attachment 871255 [details]
emerge-info.txt

Comment 2 Toralf Förster gentoo-dev

2023-09-24 17:40:18 UTC

Created attachment 871256 [details]
app-editors:emacs-29.1-r4:20230924-170201.log

Comment 3 Toralf Förster gentoo-dev

2023-09-24 17:40:19 UTC

Created attachment 871257 [details]
emerge-history.txt

Comment 4 Toralf Förster gentoo-dev

2023-09-24 17:40:20 UTC

Created attachment 871258 [details]
environment

Comment 5 Toralf Förster gentoo-dev

2023-09-24 17:40:21 UTC

Created attachment 871259 [details]
etc.portage.tar.xz

Comment 6 Toralf Förster gentoo-dev

2023-09-24 17:40:22 UTC

Created attachment 871260 [details]
temp.tar.xz

Comment 7 Ulrich Müller gentoo-dev

2023-09-24 18:18:35 UTC

Right, with USE=jit all *.elc files are deleted. So we must patch the file first, then delete it.

Comment 8 Larry the Git Cow gentoo-dev

2023-09-24 18:20:33 UTC

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4ff16db2f869316ad52abdb07cdab0c311b7bf

commit 4a4ff16db2f869316ad52abdb07cdab0c311b7bf
Author:     Ulrich Müller <ulm@gentoo.org>
AuthorDate: 2023-09-24 18:18:41 +0000
Commit:     Ulrich Müller <ulm@gentoo.org>
CommitDate: 2023-09-24 18:20:15 +0000

    app-editors/emacs: Fix build failure with USE=jit
    
    Closes: https://bugs.gentoo.org/914609
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>

 app-editors/emacs/emacs-29.1-r4.ebuild   | 4 ++--
 app-editors/emacs/emacs-29.1.9999.ebuild | 4 ++--
 app-editors/emacs/emacs-30.0.9999.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)