From: Peter Stephenson <Peter.Stephenson@csr.com>
To: <zsh-workers@zsh.org>
Subject: Re: #include problem for generated files included in system.h
Date: Wed, 11 May 2011 09:53:10 +0100 [thread overview]
Message-ID: <20110511095310.2fcb0c3f@pwslap01u.europe.root.pri> (raw)
In-Reply-To: <20110510210437.GA7827@altlinux.org>
On Wed, 11 May 2011 01:04:37 +0400
"Alexey I. Froloff" <raorn@altlinux.org> wrote:
> make[2]: Entering directory `/usr/src/RPM/BUILD/zsh-4.3.11/Src'
> i586-alt-linux-gcc -c -I. -I../Src -I../Src -I../Src/Zle -I.
> -I/usr/include/pcre -DHAVE_CONFIG_H -pipe -Wall -g -O2 -march=i586
> -mtune=i686 -o builtin.o builtin.c In file included from
> zsh.mdh:17:0, from builtin.c:33: zsh_system.h:868:26: fatal error:
> zshcurses.h: No such file or directory compilation terminated.
> make[2]: *** [builtin.o] Error 1
>
> Attached patch fixes this.
That's because the main shell now depends on zshcurses.h and zshterm.h
which it didn't used to; however, they still shouldn't be included
unconditionally, so aren't in the headers list.
There's actually a special may of indicating extra header dependencies
in the .mdd file...
Index: Src/zsh.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.mdd,v
retrieving revision 1.26
diff -p -u -r1.26 zsh.mdd
--- Src/zsh.mdd 10 May 2011 16:44:39 -0000 1.26
+++ Src/zsh.mdd 11 May 2011 08:51:11 -0000
@@ -16,6 +16,7 @@ signames.o sort.o string.o subst.o text.
headers="../config.h zsh_system.h zsh.h sigcount.h signals.h \
prototypes.h hashtable.h ztype.h"
+hdrdeps="zshcurses.h zshterm.h"
:<<\Make
@CONFIG_MK@
@@ -35,9 +36,6 @@ init.o params.o parse.o: version.h
params.o: patchlevel.h
-# The main shell doesn't currently need zshcurses.h and zshterm.h,
-# but make sure these are built with the headers.
-# If it did need need them they would be in headers at the top instead.
version.h: $(sdir_top)/Config/version.mk zshcurses.h zshterm.h
echo '#define ZSH_VERSION "'$(VERSION)'"' > $@
--
Peter Stephenson <pws@csr.com> Software Engineer
Tel: +44 (0)1223 692070 Cambridge Silicon Radio Limited
Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, UK
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
prev parent reply other threads:[~2011-05-11 8:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-09 10:44 Peter Stephenson
2011-05-09 14:25 ` Bart Schaefer
2011-05-10 16:36 ` Peter Stephenson
2011-05-10 16:45 ` Peter Stephenson
2011-05-10 21:04 ` Alexey I. Froloff
2011-05-11 8:53 ` Peter Stephenson [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110511095310.2fcb0c3f@pwslap01u.europe.root.pri \
--to=peter.stephenson@csr.com \
--cc=zsh-workers@zsh.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.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).