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

Collapse All | Expand All

(-)gem5/Makefile (-1 / +3 lines)
Lines 22-29 Link Here
22
GH_ACCOUNT=	CTSRD-CHERI
22
GH_ACCOUNT=	CTSRD-CHERI
23
GH_TAGNAME=	99d65cc
23
GH_TAGNAME=	99d65cc
24
SWIG_BIN=	swig3.0
24
SWIG_BIN=	swig3.0
25
USES=		gmake
25
USES=		gmake gettext-runtime
26
26
27
LIB_DEPENDS+=	libpython2.7.so:lang/python27
28
27
.include <bsd.port.pre.mk>
29
.include <bsd.port.pre.mk>
28
30
29
post-patch:
31
post-patch:
(-)gem5/files/patch-SConstruct (-13 / +33 lines)
Lines 1-16 Link Here
1
--- SConstruct.orig	2015-04-21 15:32:43 UTC
1
--- SConstruct.orig	2015-04-21 11:32:43.000000000 -0400
2
+++ SConstruct
2
+++ SConstruct	2018-03-11 16:51:08.430095000 -0400
3
@@ -534,6 +534,9 @@ Export('MakeAction')
3
@@ -785,13 +785,8 @@
4
 main['LTO_CCFLAGS'] = []
5
 main['LTO_LDFLAGS'] = []
6
 
7
+# Add pthread
8
+main.Append(LIBS=['pthread'])
9
+
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
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
14
 swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS')
4
 swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS')
15
 main.Append(SWIGFLAGS=swig_flags)
5
 main.Append(SWIGFLAGS=swig_flags)
16
 
6
 
Lines 26-28 Link Here
26
 main['TIMEOUT'] =  timeout_version and \
16
 main['TIMEOUT'] =  timeout_version and \
27
     compareVersions(timeout_version[-1], '8.13') >= 0
17
     compareVersions(timeout_version[-1], '8.13') >= 0
28
 
18
 
19
@@ -889,6 +884,18 @@
20
 except:
21
     pass
22
 
23
+# Check if we should compile a 64 bit binary on Mac OS X/Darwin
24
+try:
25
+    import platform
26
+    uname = platform.uname()
27
+    if uname[0] == 'FreeBSD':
28
+        main.Append(CCFLAGS=['-lthr'])
29
+        main.Append(CFLAGS=['-lthr'])
30
+        main.Append(LINKFLAGS=['-lthr'])
31
+        main.Append(ASFLAGS=['-lthr'])
32
+except:
33
+    pass
34
+
35
 # Recent versions of scons substitute a "Null" object for Configure()
36
 # when configuration isn't necessary, e.g., if the "--help" option is
37
 # present.  Unfortuantely this Null object always returns false,
38
@@ -922,8 +929,8 @@
39
     # version of python, see above for instructions on how to invoke
40
     # scons with the appropriate PATH set.
41
     #
42
-    # First we check if python2-config exists, else we use python-config
43
-    python_config = readCommand(['which', 'python2-config'],
44
+    # First we check if python2.7-config exists, else we use python-config
45
+    python_config = readCommand(['which', 'python2.7-config'],
46
                                 exception='').strip()
47
     if not os.path.exists(python_config):
48
         python_config = readCommand(['which', 'python-config'],

Return to bug 226545