pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

emacs-git: add proposed upstream fix to restore parallel build



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Jul 17 09:09:21 2026 +0200
Changeset:	5e63f07f90fdc45ade472768a0545ffefbe3b12d

Modified Files:
	emacs-git/Makefile
Added Files:
	emacs-git/distinfo
	emacs-git/patches/patch-Makefile.in

Log Message:
emacs-git: add proposed upstream fix to restore parallel build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e63f07f90fdc45ade472768a0545ffefbe3b12d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 emacs-git/Makefile                  |  3 --
 emacs-git/distinfo                  |  3 ++
 emacs-git/patches/patch-Makefile.in | 61 +++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 3 deletions(-)

diffs:
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index 5ab0f07d0e..26880fcf5d 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -1,8 +1,5 @@
 # $NetBSD$
 
-# https://lists.gnu.org/archive/html/bug-gnu-emacs/2026-07/msg00428.html
-MAKE_JOBS_SAFE=	no
-
 DISTNAME=	emacs-32.0.50
 PKGNAME=	${DISTNAME:S/emacs/emacs32/}
 CATEGORIES=	editors
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
new file mode 100644
index 0000000000..e7bbff4940
--- /dev/null
+++ b/emacs-git/distinfo
@@ -0,0 +1,3 @@
+$NetBSD$
+
+SHA1 (patch-Makefile.in) = 1babbbeda525935718778225ccc0cc2d0e118454
diff --git a/emacs-git/patches/patch-Makefile.in b/emacs-git/patches/patch-Makefile.in
new file mode 100644
index 0000000000..b5724d6e15
--- /dev/null
+++ b/emacs-git/patches/patch-Makefile.in
@@ -0,0 +1,61 @@
+$NetBSD$
+
+From 9ab4c49444e2ed2ba707e5fc32a563dde23f43e1 Mon Sep 17 00:00:00 2001
+From: Boris Buliga <boris%d12frosted.io@localhost>
+Date: Thu, 9 Jul 2026 09:47:08 +0300
+Subject: [PATCH] Fix info/dir generation in fresh checkouts (bug#81332)
+
+The previous bug#81332 fix made info/dir depend on doc/misc/NAME.texi
+names derived from INFO_COMMON.  For the manuals whose source is .org
+(modus-themes, org), these .texi files are generated and do not exist
+in a fresh checkout, and there is no rule to build them at this level,
+so building Emacs fails with:
+
+  make[1]: *** No rule to make target 'doc/misc/modus-themes.texi',
+  needed by 'info/dir'.  Stop.
+
+* Makefile.in (srcdir_doc_info_dir_inputs): For the default language,
+depend on the actual sources reported by doc/misc echo-sources
+(texi_misc_default), which lists .org sources for the org-based
+manuals; make-info-dir extracts dir entries from both formats.
+(GET_DOC_SRC): Only handle translated languages; drop the mapping of
+default translation names to doc/misc .texi names.
+---
+ Makefile.in | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+https://lists.gnu.org/archive/html/bug-gnu-emacs/2026-07/msg00428.html
+
+--- Makefile.in.orig	2026-07-15 18:05:00.000000000 +0000
++++ Makefile.in
+@@ -1190,19 +1190,27 @@ $(foreach lang,$(DOCLANGS),$(eval $(call set_texi_misc
+ 
+ $(foreach lang,$(DOCLANGS),$(eval $(call set_texi_misc,$(lang))))
+ 
++## For the default language, depend on the actual sources reported by
++## doc/misc (echo-sources): .org files for the org-based manuals and
++## .texi files for the rest.  Deriving foo.texi names from INFO_COMMON
++## would break in a fresh checkout, because the .texi files of the
++## org-based manuals (e.g. modus-themes.texi) are generated and there
++## is no rule to build them at this level.  make-info-dir extracts dir
++## entries from both formats.
+ srcdir_doc_info_dir_inputs := \
+   ${srcdir}/doc/emacs/emacs.texi \
+   ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \
+-  ${srcdir}/doc/lispref/elisp.texi
++  ${srcdir}/doc/lispref/elisp.texi \
++  $(addprefix ${srcdir}/doc/misc/,${texi_misc_default})
+ TRANSLATED_DIRS:=misc
+ # $(1) = dir
+ # $(2) = lang
+ define GET_DOC_SRC
+ -include ${srcdir}/doc/translations/$(2)/$(1)/info_common.mk
+ INFO_COMMON:=$$(subst ccmode,cc-mode,$$(INFO_COMMON))
+-srcdir_doc_info_dir_inputs:=$$(srcdir_doc_info_dir_inputs) $$(patsubst ${srcdir}/doc/translations/default/$(1)/%-default.texi,${srcdir}/doc/$(1)/%.texi,$$(patsubst %,${srcdir}/doc/translations/$(2)/$(1)/%-$(2).texi,$$(INFO_COMMON)))
++srcdir_doc_info_dir_inputs:=$$(srcdir_doc_info_dir_inputs) $$(patsubst %,${srcdir}/doc/translations/$(2)/$(1)/%-$(2).texi,$$(INFO_COMMON))
+ endef
+-$(foreach dir,$(TRANSLATED_DIRS),$(foreach lang,$(DOCLANGS),$(eval $(call GET_DOC_SRC,$(dir),$(lang)))))
++$(foreach dir,$(TRANSLATED_DIRS),$(foreach lang,$(filter-out default,$(DOCLANGS)),$(eval $(call GET_DOC_SRC,$(dir),$(lang)))))
+ 
+ info_dir_inputs = \
+   ../build-aux/dir_top \


Home | Main Index | Thread Index | Old Index