From patchwork Wed Oct 16 23:41:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ryan S. Arnold" X-Patchwork-Id: 21089 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 62928202E6 for ; Wed, 16 Oct 2013 23:41:51 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id z20sf3120233yhz.3 for ; Wed, 16 Oct 2013 16:41:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ovZkaUqJ3JoI2bW2WvdVDVAYdqIvdTzJoh5lLQVlKv4=; b=hPcRs3k+GdKMe9e9fIE2gepRAiyo9L8hb1MYtYDW5X2Bo+LW5q5wqfAYeyHHmh1Rad mEpYNq7ipIuhLxWaTo3PtxB02nWLuuESm93+TcRhG3qRDkFuyrMKmECQK60kbmC54zCu Pke9JDNetYdug+A5Wir/ULWu2RUuL4eofTE71Ny4UyS2LyzbLIQ0cQZk7Pe3j5Yq9WgJ FiCTvdu1s6pUgAmhcs76S0lvS66mbk9DqvR0W8AIDCM+hIx51df1Z2og7w89DWljVTfy LRuwRdF7Fnq15thm7DLY1gS4/oyEDE7fk5es+W2SzXAEntouz+tvqTSMZdxy3qzvtBqM Yfug== X-Received: by 10.236.32.74 with SMTP id n50mr5152837yha.13.1381966910645; Wed, 16 Oct 2013 16:41:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.82 with SMTP id b18ls776667qen.53.gmail; Wed, 16 Oct 2013 16:41:50 -0700 (PDT) X-Received: by 10.58.210.66 with SMTP id ms2mr4578453vec.10.1381966910514; Wed, 16 Oct 2013 16:41:50 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id l1si25330187vcl.139.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Oct 2013 16:41:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id im17so787279vcb.13 for ; Wed, 16 Oct 2013 16:41:50 -0700 (PDT) X-Gm-Message-State: ALoCoQnvqCEAMSF08gwLI3rVAdRcXWnWQxi+KbYg3Mhpo+wKeFsp5uacz3C2aYU5TFjxBeRuI5+T X-Received: by 10.52.65.136 with SMTP id x8mr3808991vds.23.1381966910420; Wed, 16 Oct 2013 16:41:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp75323vcz; Wed, 16 Oct 2013 16:41:49 -0700 (PDT) X-Received: by 10.50.23.16 with SMTP id i16mr4233760igf.50.1381966909190; Wed, 16 Oct 2013 16:41:49 -0700 (PDT) Received: from mail-ie0-f169.google.com (mail-ie0-f169.google.com [209.85.223.169]) by mx.google.com with ESMTPS id pe9si4148721icc.100.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Oct 2013 16:41:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.223.169 is neither permitted nor denied by best guess record for domain of ryan.arnold@linaro.org) client-ip=209.85.223.169; Received: by mail-ie0-f169.google.com with SMTP id ar20so2702733iec.0 for ; Wed, 16 Oct 2013 16:41:48 -0700 (PDT) X-Received: by 10.50.36.5 with SMTP id m5mr23886519igj.3.1381966908793; Wed, 16 Oct 2013 16:41:48 -0700 (PDT) Received: from badwing.hsd1.mn.comcast.net. (c-71-195-40-9.hsd1.mn.comcast.net. [71.195.40.9]) by mx.google.com with ESMTPSA id cy15sm5600405igc.1.2013.10.16.16.41.47 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Wed, 16 Oct 2013 16:41:48 -0700 (PDT) From: "Ryan S. Arnold" To: Rob Savoye Cc: patches@linaro.org, "Ryan S. Arnold" Subject: [PATCH] cbuild/lib/configure.sh: Fix stamp-configure* to prevent spurious configure running. Date: Wed, 16 Oct 2013 18:41:43 -0500 Message-Id: <1381966903-15153-1-git-send-email-ryan.arnold@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.arnold@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "Ryan S. Arnold" The configure stamp was being generated in ${builddir}/../ but the script was checking for it in ${builddir}/. This was causing configure to be rerun every time through the script. This is the same patch as on the 'stamp' branch. Ack it and I'll push it to master myself. Ryan S. Arnold --- lib/configure.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/configure.sh b/lib/configure.sh index 36d9d33..c8d8f07 100755 --- a/lib/configure.sh +++ b/lib/configure.sh @@ -27,8 +27,11 @@ configure_build() # name. local file="`echo ${file} | sed -e 's:/:-:'`" local stamp="stamp-configure-${file}${2:+-$2}" + # Don't look for the stamp in the builddir because it's in builddir's + # parent directory. + local stampdir="`dirname ${builddir}`" - if test ${builddir}/${stamp} -nt ${local_snapshots}/${file} -a x"${force}" = xno; then + if test ${stampdir}/${stamp} -nt ${local_snapshots}/${file} -a x"${force}" = xno; then fixme "${stamp} is newer than $1, so not configuring $1" return 0 else @@ -198,7 +201,7 @@ configure_build() default_configure_flags= fi - touch ${local_builds}/${host}/${target}/${stamp} + touch ${stampdir}/${stamp} return 0 }