From e15b4afe6f7b81b33c97deabe272df5a526bae01 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 3 Aug 2020 19:52:47 -0700 Subject: [PATCH] scons: Update some scons bug report URLs. It appears that scons bugs are not on tigris.org any more and are now on github, although fortunately old bugs seem to have been ported over and have the same numbering. This CL updates URLs which were in comments in the gem5 source, specifically in scons scripts, to point to the corresponding github version. I also checked to see if these bugs were still open, or if we could remove our workarounds for them. 1. 2356 is still open, and has been fairly recently assigned. 2. 2611 is marked as fixed. We might be able to implement the workaround in its last comment from August of 2019. 3. 2811 has been marked fixed, and as best I can tell the fix first appeared in around version 3.0 of scons. If/when that is our minimum version, we can remove the workaround in site_scons/site_tools/default.py. That is mostly fixing an annoying spurious rebuild by scons which does not affect correctness, so even if we remove that workaround we shouldn't break earlier versions, although it would be obnoxious for people that are affected by it and best avoided. Change-Id: I0d74820f399044c6f80148bf3022d07d7bf6f4e5 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32114 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- SConstruct | 4 ++-- site_scons/site_tools/default.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index b327a8b58..27a5a6120 100755 --- a/SConstruct +++ b/SConstruct @@ -114,8 +114,8 @@ Export("help_texts") # Help() function, but these two features are incompatible: once # you've overridden the help text using Help(), there's no way to get # at the help texts from AddOptions. See: -# http://scons.tigris.org/issues/show_bug.cgi?id=2356 -# http://scons.tigris.org/issues/show_bug.cgi?id=2611 +# https://github.com/SCons/scons/issues/2356 +# https://github.com/SCons/scons/issues/2611 # This hack lets us extract the help text from AddOptions and # re-inject it via Help(). Ideally someday this bug will be fixed and # we can just use AddOption directly. diff --git a/site_scons/site_tools/default.py b/site_scons/site_tools/default.py index 8e8e86366..1965a2017 100644 --- a/site_scons/site_tools/default.py +++ b/site_scons/site_tools/default.py @@ -68,7 +68,7 @@ def common_config(env): # Tell scons to avoid implicit command dependencies to avoid issues # with the param wrappes being compiled twice (see - # http://scons.tigris.org/issues/show_bug.cgi?id=2811) + # https://github.com/SCons/scons/issues/2811 env['IMPLICIT_COMMAND_DEPENDENCIES'] = 0 env.Decider('MD5-timestamp') env.root = env.Dir('#') -- 2.30.2