FreeBSD Bugzilla – Attachment 191439 Details for
Bug 226545
emulators/gem5: Fix build on FreeBSD amd64
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch (Revision 1)
gem5fix.patch (text/plain), 2.58 KB, created by
Neel Chauhan
on 2018-03-12 00:54:33 UTC
(
hide
)
Description:
Patch (Revision 1)
Filename:
MIME Type:
Creator:
Neel Chauhan
Created:
2018-03-12 00:54:33 UTC
Size:
2.58 KB
patch
obsolete
>Index: gem5/Makefile >=================================================================== >--- gem5/Makefile (revision 464212) >+++ gem5/Makefile (working copy) >@@ -22,8 +22,10 @@ > GH_ACCOUNT= CTSRD-CHERI > GH_TAGNAME= 99d65cc > SWIG_BIN= swig3.0 >-USES= gmake >+USES= gmake gettext-runtime > >+LIB_DEPENDS+= libpython2.7.so:lang/python27 >+ > .include <bsd.port.pre.mk> > > post-patch: >Index: gem5/files/patch-SConstruct >=================================================================== >--- gem5/files/patch-SConstruct (revision 464212) >+++ gem5/files/patch-SConstruct (working copy) >@@ -1,16 +1,6 @@ >---- SConstruct.orig 2015-04-21 15:32:43 UTC >-+++ SConstruct >-@@ -534,6 +534,9 @@ Export('MakeAction') >- main['LTO_CCFLAGS'] = [] >- main['LTO_LDFLAGS'] = [] >- >-+# Add pthread >-+main.Append(LIBS=['pthread']) >-+ >- # 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 >+--- SConstruct.orig 2015-04-21 11:32:43.000000000 -0400 >++++ SConstruct 2018-03-11 16:51:08.430095000 -0400 >+@@ -785,13 +785,8 @@ > swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS') > main.Append(SWIGFLAGS=swig_flags) > >@@ -26,3 +16,33 @@ > main['TIMEOUT'] = timeout_version and \ > compareVersions(timeout_version[-1], '8.13') >= 0 > >+@@ -889,6 +884,18 @@ >+ except: >+ pass >+ >++# Check if we should compile a 64 bit binary on Mac OS X/Darwin >++try: >++ import platform >++ uname = platform.uname() >++ if uname[0] == 'FreeBSD': >++ main.Append(CCFLAGS=['-lthr']) >++ main.Append(CFLAGS=['-lthr']) >++ main.Append(LINKFLAGS=['-lthr']) >++ main.Append(ASFLAGS=['-lthr']) >++except: >++ pass >++ >+ # Recent versions of scons substitute a "Null" object for Configure() >+ # when configuration isn't necessary, e.g., if the "--help" option is >+ # present. Unfortuantely this Null object always returns false, >+@@ -922,8 +929,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'],
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
nc
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 226545
:
191439
|
191440
|
191441