Attachment 191440 Details for Bug 226545 – Patch (Revision 2)

[patch] Patch (Revision 2)

gem5fix.patch (text/plain), 1.92 KB, created by Neel Chauhan on 2018-03-12 01:13:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2018-03-12 01:13:14 UTC

Size: 1.92 KB

patch

obsolete

>Index: gem5/files/patch-SConstruct
>===================================================================
>--- gem5/files/patch-SConstruct	(revision 464212)
>+++ gem5/files/patch-SConstruct	(working copy)
>@@ -1,6 +1,6 @@
>---- SConstruct.orig	2015-04-21 15:32:43 UTC
>-+++ SConstruct
>-@@ -534,6 +534,9 @@ Export('MakeAction')
>+--- SConstruct.orig	2018-03-11 21:12:18.147618000 -0400
>++++ SConstruct	2018-03-11 21:10:56.144391000 -0400
>+@@ -534,6 +534,9 @@
>  main['LTO_CCFLAGS'] = []
>  main['LTO_LDFLAGS'] = []
>  
>@@ -10,19 +10,12 @@
>  # According to the readme, tcmalloc works best if the compiler doesn't
>  # assume that we're using the builtin malloc and friends. These flags
>  # are compiler-specific, so we need to set them after we detect which
>-@@ -785,13 +788,8 @@ if main['GCC'] and compareVersions(gcc_v
>- swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS')
>- main.Append(SWIGFLAGS=swig_flags)
>- 
>--# Check for 'timeout' from GNU coreutils. If present, regressions will
>--# be run with a time limit. We require version 8.13 since we rely on
>--# support for the '--foreground' option.
>--timeout_lines = readCommand(['timeout', '--version'],
>--                            exception='').splitlines()
>--# Get the first line and tokenize it
>--timeout_version = timeout_lines[0].split() if timeout_lines else []
>-+# It expects GNU timeout, FreeBSD one (on 11.x+) is not compatible
>-+timeout_version = []
>- main['TIMEOUT'] =  timeout_version and \
>-     compareVersions(timeout_version[-1], '8.13') >= 0
>- 
>+@@ -923,7 +926,7 @@
>+     # scons with the appropriate PATH set.
>+     #
>+     # First we check if python2-config exists, else we use python-config
>+-    python_config = readCommand(['which', 'python2-config'],
>++    python_config = readCommand(['which', 'python2.7-config'],
>+                                 exception='').strip()
>+     if not os.path.exists(python_config):
>+         python_config = readCommand(['which', 'python-config'],

Flags:

nc: maintainer-approval+

Actions: View | Diff

Attachments on bug 226545: 191439 | 191440 | 191441