Issue #2974 - Part 67: Last-minute FreeBSD fixes.

Something went wrong on FreeBSD... I hope I don't have to go back
to the drawing board again.

build/gyp_base.mozbuild

@@ -18,7 +18,7 @@ flavors = {
     'Linux': 'linux',
     'Darwin': 'mac',
     'SunOS': 'solaris',
-    'GNU/kFreeBSD': 'freebsd',
+    'kFreeBSD': 'freebsd',
     'DragonFly': 'dragonfly',
     'FreeBSD': 'freebsd',
     'NetBSD': 'netbsd',

build/ppCheck.py

@@ -3,7 +3,7 @@
 from __future__ import print_function
 import os, sys
 
-if not len(sys.argv) is 2 or not os.path.exists(sys.argv[1]):
+if not len(sys.argv) == 2 or not os.path.exists(sys.argv[1]):
   print("\nYou did not supply a valid path to check.")
   exit(1)
 else:
@@ -80,4 +80,4 @@ if len(PP_BAD_ENCODING_FILES) > 0:
   for file in PP_BAD_ENCODING_FILES:
     print(file)
 
-sys.exit(0)
+sys.exit(0)

ipc/chromium/moz.build

@@ -108,7 +108,7 @@ if os_bsd:
         'src/base/atomicops_internals_x86_gcc.cc',
         'src/base/time_posix.cc',
     ]
-    if CONFIG['OS_ARCH'] == 'GNU_kFreeBSD':
+    if CONFIG['OS_ARCH'] == 'kFreeBSD':
         SOURCES += [
             'src/base/process_util_linux.cc'
         ]

ipc/ipdl/ipdl/lower.py

@@ -956,11 +956,11 @@ class MessageDecl(ipdl.ast.MessageDecl):
 |params| and |returns| is the C++ semantics of those: 'in', 'out', or None."""
 
         def makeDecl(d, sems):
-            if sems is 'in':
+            if sems == 'in':
                 return Decl(d.inType(side), d.name)
-            elif sems is 'move':
+            elif sems == 'move':
                 return Decl(d.moveType(side), d.name)
-            elif sems is 'out':
+            elif sems == 'out':
                 return Decl(d.outType(side), d.name)
             else: assert 0
 
@@ -981,24 +981,24 @@ class MessageDecl(ipdl.ast.MessageDecl):
         assert not retcallsems or retsems # retcallsems => returnsems
         cxxargs = [ ]
 
-        if paramsems is 'move':
+        if paramsems == 'move':
             cxxargs.extend([ ExprMove(p.var()) for p in self.params ])
-        elif paramsems is 'in':
+        elif paramsems == 'in':
             cxxargs.extend([ p.var() for p in self.params ])
         else:
             assert False
 
         for ret in self.returns:
-            if retsems is 'in':
-                if retcallsems is 'in':
+            if retsems == 'in':
+                if retcallsems == 'in':
                     cxxargs.append(ret.var())
-                elif retcallsems is 'out':
+                elif retcallsems == 'out':
                     cxxargs.append(ExprAddrOf(ret.var()))
                 else: assert 0
-            elif retsems is 'out':
-                if retcallsems is 'in':
+            elif retsems == 'out':
+                if retcallsems == 'in':
                     cxxargs.append(ExprDeref(ret.var()))
-                elif retcallsems is 'out':
+                elif retcallsems == 'out':
                     cxxargs.append(ret.var())
                 else: assert 0
 
@@ -2700,7 +2700,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
         else:
             inherits.append(Inherit(p.managerInterfaceType(), viz='public'))
 
-        if ptype.isToplevel() and self.side is 'parent':
+        if ptype.isToplevel() and self.side == 'parent':
             self.hdrfile.addthings([
                     _makeForwardDeclForQClass('nsIFile', []),
                     Whitespace.NL
@@ -4640,11 +4640,11 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
         if actor is not None:  stateexpr = _actorState(actor)
         else:                  stateexpr = self.protocol.stateVar()
 
-        if (self.side is 'parent' and direction is 'out'
-            or self.side is 'child' and direction is 'in'):
+        if (self.side == 'parent' and direction == 'out'
+            or self.side == 'child' and direction == 'in'):
             action = ExprVar('Trigger::Send')
-        elif (self.side is 'parent' and direction is 'in'
-            or self.side is 'child' and direction is 'out'):
+        elif (self.side == 'parent' and direction == 'in'
+            or self.side == 'child' and direction == 'out'):
             action = ExprVar('Trigger::Recv')
         else: assert 0 and 'unknown combo %s/%s'% (self.side, direction)
 

media/libstagefright/moz.build

@@ -29,7 +29,7 @@ elif CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'OpenBSD', 'NetBSD',
     if CONFIG['OS_TARGET'] == 'OpenBSD':
         DEFINES['EBADMSG'] = '-0x80000006'
     DEFINES['HAVE_SYS_UIO_H'] = True
-    if CONFIG['OS_TARGET'] != 'GNU/kFreeBSD':
+    if CONFIG['OS_TARGET'] != 'kFreeBSD':
         DEFINES['off64_t'] = 'off_t'
         LOCAL_INCLUDES += [ 'ports/bsd/include' ]
 else:

xpcom/idl-parser/xpidl/xpidl.py

@@ -516,7 +516,7 @@ class Interface(object):
         if self.attributes.function:
             has_method = False
             for member in self.members:
-                if member.kind is 'method':
+                if member.kind == 'method':
                     if has_method:
                         raise IDLError("interface '%s' has multiple methods, but marked 'function'" % self.name, self.location)
                     else: