Bug 1442791 - Unbreak ANGLE build on Tier3 after bug 1440849. r?jgilbert draft
authorJan Beich <jbeich@FreeBSD.org>
Sat, 03 Mar 2018 22:20:09 +0000
changeset 770375 b7805f695d1ea9901fe64db3968e8a5c3e915331
parent 770373 3d21d31141dc5e2d2aff89203458125a3cce6c64
push id103394
push userbmo:jbeich@FreeBSD.org
push dateWed, 21 Mar 2018 04:25:16 +0000
reviewersjgilbert
bugs1442791, 1440849
milestone61.0a1
Bug 1442791 - Unbreak ANGLE build on Tier3 after bug 1440849. r?jgilbert system_utils* are unused in Gecko, so just build Linux version as a stub. https://searchfox.org/mozilla-central/search?regexp=true&q=\bGetExecutable%28Path%7CDirectory%29\B MozReview-Commit-ID: Imu1HGavlVz
gfx/angle/targets/angle_common/moz.build
gfx/angle/update-angle.py
--- a/gfx/angle/targets/angle_common/moz.build
+++ b/gfx/angle/targets/angle_common/moz.build
@@ -121,16 +121,40 @@ SOURCES += [
 if CONFIG['OS_ARCH'] == 'Darwin':
     SOURCES += [
         '../../checkout/src/common/system_utils_mac.cpp',
     ]
 if CONFIG['OS_ARCH'] == 'Linux':
     SOURCES += [
         '../../checkout/src/common/system_utils_linux.cpp',
     ]
+if CONFIG['OS_ARCH'] == 'SunOS':
+    SOURCES += [
+        '../../checkout/src/common/system_utils_linux.cpp',
+    ]
+if CONFIG['OS_ARCH'] == 'GNU_kFreeBSD':
+    SOURCES += [
+        '../../checkout/src/common/system_utils_linux.cpp',
+    ]
+if CONFIG['OS_ARCH'] == 'DragonFly':
+    SOURCES += [
+        '../../checkout/src/common/system_utils_linux.cpp',
+    ]
+if CONFIG['OS_ARCH'] == 'FreeBSD':
+    SOURCES += [
+        '../../checkout/src/common/system_utils_linux.cpp',
+    ]
+if CONFIG['OS_ARCH'] == 'NetBSD':
+    SOURCES += [
+        '../../checkout/src/common/system_utils_linux.cpp',
+    ]
+if CONFIG['OS_ARCH'] == 'OpenBSD':
+    SOURCES += [
+        '../../checkout/src/common/system_utils_linux.cpp',
+    ]
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         '../../checkout/src/common/system_utils_win.cpp',
     ]
 #
 #LDFLAGS += [
 #    '/DEBUG',
 #    '/WX',
--- a/gfx/angle/update-angle.py
+++ b/gfx/angle/update-angle.py
@@ -424,17 +424,20 @@ def export_target(root):
     for x in fixup_paths(accum_desc['sources']):
         (b, e) = x.rsplit('.', 1)
         if e in ['h', 'y', 'l', 'inl']:
             continue
         elif e in ['cpp', 'cc']:
             if b.endswith('_win'):
                 sources_by_os_arch.setdefault('WINNT', []).append(x)
             elif b.endswith('_linux'):
-                sources_by_os_arch.setdefault('Linux', []).append(x)
+                # Bug 1442791: Let Tier3 platforms use Linux files for now
+                for os_arch in ('Linux', 'SunOS', 'GNU_kFreeBSD',
+                                'DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
+                    sources_by_os_arch.setdefault(os_arch, []).append(x)
             elif b.endswith('_mac'):
                 sources_by_os_arch.setdefault('Darwin', []).append(x)
             else:
                 sources.append(x)
             continue
         elif e == 'rc':
             assert 'RCFILE' not in extras
             extras['RCFILE'] = "'{}'".format(x)