View | Details | Raw Unified | Return to bug 226545 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 226545