From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 65AB63851C0E for ; Tue, 13 Oct 2020 14:26:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 65AB63851C0E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=simark.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=simark@simark.ca Received: from [10.0.0.11] (173-246-6-90.qc.cable.ebox.net [173.246.6.90]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 069201E58E; Tue, 13 Oct 2020 10:26:48 -0400 (EDT) Subject: Re: [PATCH] gnulib: Ensure all libraries are used when building gdb/gdbserver To: Andrew Burgess Cc: Joel Brobecker , gdb-patches@sourceware.org References: <20201005165134.1620549-1-andrew.burgess@embecosm.com> <2feb66c2-8f65-7cbf-d1be-ae3d04b45d9a@simark.ca> <20201006121751.GK605036@embecosm.com> <95d52add-47c2-9621-7e60-1ff9a4331324@simark.ca> <20201007153319.GL605036@embecosm.com> <20201009083436.GP605036@embecosm.com> <20201012114130.GA28251@adacore.com> <20201012153014.GV605036@embecosm.com> From: Simon Marchi Message-ID: <0adb14bc-100c-7e0d-7f45-ffaa66d43926@simark.ca> Date: Tue, 13 Oct 2020 10:26:48 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20201012153014.GV605036@embecosm.com> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, NICE_REPLY_A, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2020 14:26:50 -0000 On 2020-10-12 11:30 a.m., Andrew Burgess wrote: > commit 75b86a705adbb127962beb5ef8d9d7181afe3789 > Author: Andrew Burgess > Date: Mon Oct 12 16:04:32 2020 +0100 > > gdb/gdbserver: use '-include' to pull in Makefile.gnulib.inc The patch subject doesn't seem right. > > After commit: > > commit 361cb219351d8b7e39e1962fe77f40aa80657b27 > Date: Tue Oct 6 10:09:06 2020 +0100 > > gnulib: Ensure all libraries are used when building gdb/gdbserver > > We now get an error when, at the top level of the build tree, we do > 'make distclean'. > > The reason for this is that the gnulib directory is cleaned before the > gdb directory, cleaning gnulib deletes Makefile.gnulib.inc from the > gnulib build directory, which is currently pulled in by the gdb > Makefile.in using 'include'. > > This commit adds a dependency between distclean-gnulib and both > distclean-gdb and distclean-gdbserver. This means that gdb and > gdbserver will be cleaned before gnulib, as a result the > Makefile.gnulib.inc file should exist when needed. > > ChangeLog: > > * Makefile.in: Rebuild. > * Makefile.def: Make distclean-gnulib depend on distclean-gdb and > distclean-gdbserver. > > diff --git a/Makefile.def b/Makefile.def > index 76d062bb671..089e70ae3ed 100644 > --- a/Makefile.def > +++ b/Makefile.def > @@ -548,6 +548,12 @@ dependencies = { module=configure-libctf; on=all-intl; }; > dependencies = { module=configure-libctf; on=all-zlib; }; > dependencies = { module=configure-libctf; on=all-libiconv; }; > > +// The Makefiles in gdb and gdbserver pull in a file that configure > +// generates in the gnulib directory, so distclean gnulib only after > +// gdb and gdbserver. > +dependencies = { module=distclean-gnulib; on=distclean-gdb; }; > +dependencies = { module=distclean-gnulib; on=distclean-gdbserver; }; > + > // Warning, these are not well tested. > dependencies = { module=all-bison; on=all-intl; }; > dependencies = { module=all-bison; on=all-build-texinfo; }; > diff --git a/Makefile.in b/Makefile.in > index 9dfd39fae13..fe34132f9e5 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -52366,6 +52366,8 @@ configure-stage3-libctf: maybe-all-stage3-libiconv > configure-stage4-libctf: maybe-all-stage4-libiconv > configure-stageprofile-libctf: maybe-all-stageprofile-libiconv > configure-stagefeedback-libctf: maybe-all-stagefeedback-libiconv > +distclean-gnulib: maybe-distclean-gdb > +distclean-gnulib: maybe-distclean-gdbserver > all-bison: maybe-all-build-texinfo > all-flex: maybe-all-build-bison > all-flex: maybe-all-m4 > I haven't tested, but I presume that you were able to reproduce the problem and test the fix. If so, that LGTM. Thanks! Simon