From: Paul Eggert <eggert@cs.ucla.edu>
To: Glenn Morris <rgm@gnu.org>, emacs-devel@gnu.org
Cc: Philipp Stephani <phst@google.com>
Subject: Re: master 72ec233: Ignore pending_signals when checking for quits.
Date: Mon, 25 Feb 2019 17:47:20 -0800 [thread overview]
Message-ID: <f12c780c-dae5-0cb7-5c43-cac838e73f84@cs.ucla.edu> (raw)
In-Reply-To: <98bm2z7cdb.fsf@fencepost.gnu.org>
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
On 2/25/19 2:05 PM, Glenn Morris wrote:
> Ref: https://hydra.nixos.org/build/89511758
I reproduced that problem on Fedora 29 and fixed it by installed the
attached patch. Not sure it's the best way to fix it, but at least now
the test works for me.
[-- Attachment #2: 0001-Fix-mod-test-build-failure.patch --]
[-- Type: text/x-patch, Size: 1638 bytes --]
From b5ebfbfdee2d486269f6ad5c57f27edbb1d919b7 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@Penguin.CS.UCLA.EDU>
Date: Mon, 25 Feb 2019 17:44:46 -0800
Subject: [PATCH] Fix mod-test build failure
Problem reported by Glenn Morris in:
https://lists.gnu.org/r/emacs-devel/2019-02/msg00739.html
* test/Makefile.in (HYBRID_MALLOC, LIBEGNU_ARCHIVE):
New macros, taken from ../src/Makefile.in.
(MODULE_CFLAGS): Add -I$(srcdir)/../lib.
($(test_module)): Link $(LIBEGNU_ARCHIVE) too.
---
test/Makefile.in | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index 4eddb676d4..ce6ce04b8b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -254,17 +254,21 @@ FPIC_CFLAGS =
FPIC_CFLAGS = -fPIC
endif
+HYBRID_MALLOC = @HYBRID_MALLOC@
+LIBEGNU_ARCHIVE = ../lib/lib$(if $(HYBRID_MALLOC),e)gnu.a
+
# Note: emacs-module.h is generated from emacs-module.h.in, hence we
# look in ../src, not $(srcdir)/../src.
-MODULE_CFLAGS = -I../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
+MODULE_CFLAGS = -I../src -I$(srcdir)/../lib \
+ $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
$(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
test_module = $(test_module_dir)/mod-test${SO}
src/emacs-module-tests.log: $(test_module)
-$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h
+$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h $(LIBEGNU_ARCHIVE)
$(AM_V_at)${MKDIR_P} $(dir $@)
$(AM_V_CCLD)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \
- -o $@ $<
+ -o $@ $< $(LIBEGNU_ARCHIVE)
endif
## Check that there is no 'automated' subdirectory, which would
--
2.20.1
next prev parent reply other threads:[~2019-02-26 1:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190224215115.3364.94205@vcs0.savannah.gnu.org>
[not found] ` <20190224215116.2B65D209A5@vcs0.savannah.gnu.org>
2019-02-25 22:05 ` master 72ec233: Ignore pending_signals when checking for quits Glenn Morris
2019-02-26 1:47 ` Paul Eggert [this message]
2019-02-26 6:46 ` Philipp Stephani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f12c780c-dae5-0cb7-5c43-cac838e73f84@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=phst@google.com \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).