| Message ID | 1381966903-15153-1-git-send-email-ryan.arnold@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 10/16/2013 05:41 PM, Ryan S. Arnold wrote: > From: "Ryan S. Arnold" <ryan.arnold@linaro.org> > > 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. Sounds good. - rob -
On Wed, Oct 16, 2013 at 6:42 PM, Rob Savoye <rob.savoye@linaro.org> wrote: > On 10/16/2013 05:41 PM, Ryan S. Arnold wrote: >> From: "Ryan S. Arnold" <ryan.arnold@linaro.org> >> >> 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. > > Sounds good. > > - rob - >
On Wed, Oct 16, 2013 at 7:46 PM, Ryan Arnold <ryan.arnold@linaro.org> wrote: > On Wed, Oct 16, 2013 at 6:42 PM, Rob Savoye <rob.savoye@linaro.org> wrote: >> On 10/16/2013 05:41 PM, Ryan S. Arnold wrote: >>> From: "Ryan S. Arnold" <ryan.arnold@linaro.org> >>> >>> 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. >> >> Sounds good. >> >> - rob - >> Pushed to master with: commit b6e6f52b1d980e036ef3577690a6fc230c430d53 Author: Ryan S. Arnold <ryan.arnold@linaro.org> Date: Wed Oct 16 18:29:20 2013 -0500 Fix stamp-configure* to prevent configure from always being run. 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.
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 }
From: "Ryan S. Arnold" <ryan.arnold@linaro.org> 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(-)