From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by sourceware.org (Postfix) with ESMTPS id 14C963836C73 for ; Wed, 14 Oct 2020 14:09:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 14C963836C73 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x343.google.com with SMTP id q5so2798587wmq.0 for ; Wed, 14 Oct 2020 07:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=vT8HjgbsxBM5vwHtEVjdGOfxDF7X0pyKY19piHot2kI=; b=Wl5aPU6Nd4c704co+gDmgssfvFtsT0o5cJKpkXXRSuukPnEewZ9SQcwCs6qym5f3bk 16saWdSeJ6oKWqadi9KO5WmhklTTzMJFBg5o5OQjGGLzY7nAoJ1OWqrmobetvzKKquOa C49dbSs2j/I7pBkK0sW5syJARpc3xRR07VKugUgyZbmPpsC7PwFNLDD4wJbRWLgTpRot 5siGpEM7J3MzRkjwmMP0Q0ZFFjfhzIf6G0azYpiwWhecWFRSmhz2Rec+vey09OH1Bk43 y+Mo7b4PChx5kndV715Rfwi9Ns0IMQzEM0HYKqJCVJEqI+HTa/wUwYpipHOO4dEajGo1 fnAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=vT8HjgbsxBM5vwHtEVjdGOfxDF7X0pyKY19piHot2kI=; b=RL6CFSP32G497tWsnDotTQbkk+pDxsMNTqYlAOnDl8KGYhFuKbKY7icZleBCs3VRYq VzNfbe3S0xjVD1+DOUUranYRKC8TvAJr+KKzPG5f2NFCCw75jgw43ILquEj1hZMMHt0J Dbir3wxBUL1ixu4NscbGsuUB4t5EX+O6LvsTitwJ5ycclWofKMtGIuSCrDEntetqZahD PFsVxipaeuHcXysObPJIQTPMZ4ZVNzn8iysfhV6WCCJxaH/UfRFX3c4YcPY3+VpGp1Qs W9NKKw8LNZj84aYStf6tET99+3kbXJU9zwhcSBo8Fjagccm+KXJvHslZqFuIHqcqOqZS NpNA== X-Gm-Message-State: AOAM531+57JOm2pddnQ9oJzqStGzHTdYkv7g9JGbgwLqnhq0UNPeuLfd bHxXfuUXYU5qfrasqyvBnMQXKA== X-Google-Smtp-Source: ABdhPJzQHhdAIN9901F5S2JwIqLJSqCZPqwC3ULcsFpmM2HXN++7qCJ7uDn9KspBsflN6Hf299U7iQ== X-Received: by 2002:a1c:4306:: with SMTP id q6mr3873171wma.189.1602684558462; Wed, 14 Oct 2020 07:09:18 -0700 (PDT) Received: from localhost (host86-130-161-39.range86-130.btcentralplus.com. [86.130.161.39]) by smtp.gmail.com with ESMTPSA id g14sm5177584wrx.22.2020.10.14.07.09.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 07:09:17 -0700 (PDT) Date: Wed, 14 Oct 2020 15:09:16 +0100 From: Andrew Burgess To: Simon Marchi Cc: Joel Brobecker , gdb-patches@sourceware.org Subject: Re: [PATCH] gnulib: Ensure all libraries are used when building gdb/gdbserver Message-ID: <20201014140916.GW605036@embecosm.com> 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> <0adb14bc-100c-7e0d-7f45-ffaa66d43926@simark.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0adb14bc-100c-7e0d-7f45-ffaa66d43926@simark.ca> X-Operating-System: Linux/5.8.12-100.fc31.x86_64 (x86_64) X-Uptime: 15:07:12 up 11 days, 6:19, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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: Wed, 14 Oct 2020 14:09:22 -0000 * Simon Marchi [2020-10-13 10:26:48 -0400]: > > 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. Indeed. I updated the commit message title to: gdb/gdbserver: add dependencies for distclean-gnulib And pushed this patch. Joel - I think everything should be good now, but do let me know if you are still seeing problems. Thanks, Andrew