Attachment 191441 Details for Bug 226545 – Patch (Revision 3)

[patch] Patch (Revision 3)

gem5fix.patch (text/plain), 1.61 KB, created by Neel Chauhan on 2018-03-12 01:20:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2018-03-12 01:20:52 UTC

Size: 1.61 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	2015-04-21 11:32:43.000000000 -0400
>++++ SConstruct	2018-03-11 21:17:31.106873000 -0400
>+@@ -534,6 +534,9 @@
>  main['LTO_CCFLAGS'] = []
>  main['LTO_LDFLAGS'] = []
>  
>@@ -10,7 +10,7 @@
>  # 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
>+@@ -785,13 +788,8 @@
>  swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS')
>  main.Append(SWIGFLAGS=swig_flags)
>  
>@@ -26,3 +26,14 @@
>  main['TIMEOUT'] =  timeout_version and \
>      compareVersions(timeout_version[-1], '8.13') >= 0
>  
>+@@ -922,8 +920,8 @@
>+     # version of python, see above for instructions on how to invoke
>+     # scons with the appropriate PATH set.
>+     #
>+-    # First we check if python2-config exists, else we use python-config
>+-    python_config = readCommand(['which', 'python2-config'],
>++    # First we check if python2.7-config exists, else we use python-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