From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29122 invoked by alias); 11 May 2011 08:53:24 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 29217 Received: (qmail 15487 invoked from network); 11 May 2011 08:53:21 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=ham version=3.3.1 Received-SPF: none (ns1.primenet.com.au: domain at csr.com does not designate permitted sender hosts) Date: Wed, 11 May 2011 09:53:10 +0100 From: Peter Stephenson To: Subject: Re: #include problem for generated files included in system.h Message-ID: <20110511095310.2fcb0c3f@pwslap01u.europe.root.pri> In-Reply-To: <20110510210437.GA7827@altlinux.org> References: <20110509114402.38f33fd3@pwslap01u.europe.root.pri> <110509072517.ZM19256@torch.brasslantern.com> <20110510173629.21735f0a@pwslap01u.europe.root.pri> <20110510174510.61172637@pwslap01u.europe.root.pri> <20110510210437.GA7827@altlinux.org> Organization: Cambridge Silicon Radio X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.103.11.49] X-Scanned-By: MailControl A_10_80_00 (www.mailcontrol.com) on 10.71.0.140 On Wed, 11 May 2011 01:04:37 +0400 "Alexey I. Froloff" 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 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