From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23305 invoked by alias); 28 Jun 2013 12:05:38 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 23273 invoked by uid 89); 28 Jun 2013 12:05:32 -0000 X-Spam-SWARE-Status: No, score=-4.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 28 Jun 2013 12:05:31 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1UsXQe-0004py-Si from Yao_Qi@mentor.com ; Fri, 28 Jun 2013 05:05:28 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 28 Jun 2013 05:05:28 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Fri, 28 Jun 2013 05:05:27 -0700 Message-ID: <51CD7BEB.5060309@codesourcery.com> Date: Fri, 28 Jun 2013 12:10:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Pedro Alves CC: Subject: Re: [PATCH 1/9] Reimport gnulib from scratch. References: <20130627185200.6625.10526.stgit@brno.lan> <20130627185207.6625.27448.stgit@brno.lan> <51CD4C4A.9030605@codesourcery.com> <51CD51F0.1080203@redhat.com> In-Reply-To: <51CD51F0.1080203@redhat.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-SW-Source: 2013-06/txt/msg00874.txt.bz2 On 06/28/2013 05:05 PM, Pedro Alves wrote: > You misunderstand. I never said we_need_ to reimport gnulib in > order to pull in unistd. This patch is in the series as I based > subsequent patches on top of it. It isn't strictly necessary, > and we could do this reimporting after the series instead. Sorry > if that wasn't clear. I misunderstood it, because patch 1/9 is one of the patches "Import unistd and pathmax gnulib modules.", and I never tried removing 'import' directory and run update-gnulib.sh. > >> >Here are my steps, >> > >> >1. cd to and check out commit. >> >8d5bd1402003bd0153984b138735adf537d960b0, which is required by >> >update-gnulib.sh >> > >> >2. Modify update-gnulib.sh to add unistd into IMPORTED_GNULIB_MODULES, >> > >> >3. Run 'bash update-gnulib.sh '. >> > >> >Here is the diff of aclocal.m4, for the reference sake. > As you see from your diff, doing things that way preserves > onlyonce.m4. > > Now try what I suggested. Do: > > 1.1. mv import import.old > 1.2. mkdir import > 1.3. Run 'bash update-gnulib.sh '. > 1.4. Diff the resulting gnulib/ trees. (or git diff, or whatever) > > You'll (I hope) differences similar this patch #1. > Yes, I can get the patch #1 in my local tree. > At this point, one begins to wonder whether unistd is related. > Then go back to a pristine tree, and do the same exercise, > but without importing unistd: > > 2.1. Run 'bash update-gnulib.sh '. > 2.2. Diff the result, nothing should have changed. > 2.2. mv import import.old > 2.3. mkdir import > 2.4. Run 'bash update-gnulib.sh '. > 2.5. Diff the resulting gnulib/ trees. > > At 2.5, you should see a diff just like this patch #1. > > What I'm saying is that we should be able to generate our gnulib > import from scratch and end up with the exact same as we have > in the tree. But, if we actually try doing it, we don't! > Agreed. Otherwise, when we upgrade gnulib to a recent commit, we'll get some unexpected changes in the diff. > So this patch proposes getting rid of the cruft gnulib-tool is > leaving behind, and I'm suggesting we should probably be > doing this always. So "this" means remove directory 'import', run update-gnulib.sh, and make sure there is no diff in gdb/gnulib, right? > > I'd be interested in knowing if you can reproduce these > results. Yeah, I can reproduce that. -- Yao (齐尧)