rpms/emacs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase pdm-fingerprint patch

Browse Source
This commit is contained in:
Dan Čermák 2022-09-12 13:38:57 +02:00
parent 665fa92b7e
commit b7ecd22927
No known key found for this signature in database
GPG Key ID: 8F8C178E966641D3
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
emacs-pdmp-fingerprint.patch
View File

@ -1,7 +1,7 @@
From e81f1faca4382ed5c8f15fec84fb7c900a5468f9 Mon Sep 17 00:00:00 2001 From 31607778ef262e5c25a65eb479f9531c5803f4a6 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org> From: Glenn Morris <rgm@gnu.org>
Date: Mon, 11 Oct 2021 14:03:26 +0200 Date: Mon, 11 Oct 2021 14:03:26 +0200
Subject: Make the installed pmdp file use a fingerprint Subject: [PATCH] Make the installed pmdp file use a fingerprint
* Makefile.in (EMACS_PDMP): Use --fingerprint. * Makefile.in (EMACS_PDMP): Use --fingerprint.
@ -23,10 +23,10 @@ pdmp file (bug#42790).
5 files changed, 40 insertions(+), 4 deletions(-) 5 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 5fc1edc..c6c507f 100644 index c902b46ced..f8b8058d96 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -313,6 +313,7 @@ TRANSFORM = @program_transform_name@ @@ -313,6 +313,7 @@ TRANSFORM =
EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'`
EMACS = ${EMACS_NAME}${EXEEXT} EMACS = ${EMACS_NAME}${EXEEXT}
EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT} EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
@ -34,7 +34,7 @@ index 5fc1edc..c6c507f 100644
# Subdirectories to make recursively. # Subdirectories to make recursively.
SUBDIR = $(NTDIR) lib lib-src src lisp SUBDIR = $(NTDIR) lib lib-src src lisp
@@ -521,7 +522,7 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR) @@ -521,7 +522,7 @@ install-arch-dep:
ifeq (${ns_self_contained},no) ifeq (${ns_self_contained},no)
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)"
ifeq (${DUMPING},pdumper) ifeq (${DUMPING},pdumper)
@ -44,10 +44,10 @@ index 5fc1edc..c6c507f 100644
-chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)" -chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)"
ifndef NO_BIN_LINK ifndef NO_BIN_LINK
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index d5177fa..313682b 100644 index ffab2b2213..b3f84098e7 100644
--- a/doc/emacs/cmdargs.texi --- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi
@@ -185,6 +185,11 @@ successfully. @@ -185,6 +185,11 @@ Action Arguments
@item --version @item --version
@opindex --version @opindex --version
Print Emacs version, then exit successfully. Print Emacs version, then exit successfully.
@ -60,10 +60,10 @@ index d5177fa..313682b 100644
@node Initial Options @node Initial Options
diff --git a/src/emacs.c b/src/emacs.c diff --git a/src/emacs.c b/src/emacs.c
index 866e43f..cda7a9b 100644 index 0a90b0913b..1907065a95 100644
--- a/src/emacs.c --- a/src/emacs.c
+++ b/src/emacs.c +++ b/src/emacs.c
@@ -133,6 +133,7 @@ extern char etext; @@ -133,6 +133,7 @@ #define MAIN_PROGRAM
#endif #endif
#include "pdumper.h" #include "pdumper.h"
@ -71,7 +71,7 @@ index 866e43f..cda7a9b 100644
#include "epaths.h" #include "epaths.h"
static const char emacs_version[] = PACKAGE_VERSION; static const char emacs_version[] = PACKAGE_VERSION;
@@ -255,6 +256,7 @@ Initialization options:\n\ @@ -255,6 +256,7 @@ #define MAIN_PROGRAM
#ifdef HAVE_PDUMPER #ifdef HAVE_PDUMPER
"\ "\
--dump-file FILE read dumped state from FILE\n\ --dump-file FILE read dumped state from FILE\n\
@ -113,9 +113,9 @@ index 866e43f..cda7a9b 100644
+ sprintf (dump_file, "%s%c%s-%s%s", + sprintf (dump_file, "%s%c%s-%s%s",
+ path_exec, DIRECTORY_SEP, argv0_base, hexbuf, suffix); + path_exec, DIRECTORY_SEP, argv0_base, hexbuf, suffix);
#if !defined (NS_SELF_CONTAINED) #if !defined (NS_SELF_CONTAINED)
/* Assume the Emacs binary lives in a sibling directory as set up by if (!(emacs_executable && *emacs_executable))
the default installation configuration. */ {
@@ -1387,6 +1397,23 @@ main (int argc, char **argv) @@ -1424,6 +1434,23 @@ main (int argc, char **argv)
exit (0); exit (0);
} }
@ -140,7 +140,7 @@ index 866e43f..cda7a9b 100644
#ifdef HAVE_PDUMPER #ifdef HAVE_PDUMPER
if (dumped_with_pdumper_p ()) if (dumped_with_pdumper_p ())
diff --git a/src/pdumper.c b/src/pdumper.c diff --git a/src/pdumper.c b/src/pdumper.c
index 11c680d..977f4fb 100644 index b0167299d7..56a5e2ec6d 100644
--- a/src/pdumper.c --- a/src/pdumper.c
+++ b/src/pdumper.c +++ b/src/pdumper.c
@@ -312,7 +312,7 @@ dump_reloc_set_offset (struct dump_reloc *reloc, dump_off offset) @@ -312,7 +312,7 @@ dump_reloc_set_offset (struct dump_reloc *reloc, dump_off offset)
@ -153,10 +153,10 @@ index 11c680d..977f4fb 100644
unsigned char const xfingerprint[sizeof fingerprint]) unsigned char const xfingerprint[sizeof fingerprint])
{ {
diff --git a/src/pdumper.h b/src/pdumper.h diff --git a/src/pdumper.h b/src/pdumper.h
index deec9af..bc339c4 100644 index 8383283894..002e1d88ce 100644
--- a/src/pdumper.h --- a/src/pdumper.h
+++ b/src/pdumper.h +++ b/src/pdumper.h
@@ -50,6 +50,9 @@ enum { PDUMPER_NO_OBJECT = -1 }; @@ -50,6 +50,9 @@ #define PDUMPER_IGNORE(thing) ((void) &(thing))
#define PDUMPER_REMEMBER_SCALAR(thing) \ #define PDUMPER_REMEMBER_SCALAR(thing) \
pdumper_remember_scalar (&(thing), sizeof (thing)) pdumper_remember_scalar (&(thing), sizeof (thing))
@ -167,5 +167,5 @@ index deec9af..bc339c4 100644
INLINE void INLINE void
-- --
cgit v1.1 2.37.3