Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 14 insertions, 31 deletions

diff --git a/ipc/chromium/src/third_party/libeventcommon.mozbuild b/ipc/chromium/src/third_party/libeventcommon.mozbuild
index 5037ec77a5..e8a74bf802 100644
--- a/ipc/chromium/src/third_party/libeventcommon.mozbuild
+++ b/ipc/chromium/src/third_party/libeventcommon.mozbuild
@@ -4,35 +4,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-os_win = 0
-os_posix = 0
-os_macosx = 0
-os_bsd = 0
-os_linux = 0
-os_solaris = 0
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    os_win = 1
+if CONFIG['TARGET_KERNEL'] == 'Darwin':
+    libevent_include_suffix = 'mac'
+elif CONFIG['TARGET_KERNEL'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
+    libevent_include_suffix = 'bsd'
+elif CONFIG['TARGET_KERNEL'] == 'SunOS':
+    libevent_include_suffix = 'solaris'
+elif CONFIG['TARGET_OS'] == 'Android':
+    libevent_include_suffix = 'android'
 else:
-    os_posix = 1
-    if CONFIG['OS_ARCH'] == 'Darwin':
-        os_macosx = 1
-        libevent_include_suffix = 'mac'
-    elif CONFIG['OS_ARCH'] in ['DragonFly', 'FreeBSD', 'GNU_kFreeBSD',
-                               'NetBSD', 'OpenBSD']:
-        os_bsd = 1
-        libevent_include_suffix = 'bsd'
-    elif CONFIG['OS_ARCH'] == 'SunOS':
-        os_solaris = 1
-        libevent_include_suffix = 'solaris'
-    else:
-        os_linux = 1
-        if CONFIG['OS_TARGET'] == 'Android':
-            libevent_include_suffix = 'android'
-        else:
-            libevent_include_suffix = 'linux'
+    libevent_include_suffix = 'linux'
 
-if os_posix and not CONFIG['MOZ_SYSTEM_LIBEVENT']:
+if CONFIG["TARGET_KERNEL"] != "WINNT" and not CONFIG['MOZ_SYSTEM_LIBEVENT']:
     DEFINES['HAVE_CONFIG_H'] = True
     LOCAL_INCLUDES += sorted([
         'libevent',
diff --git a/ipc/chromium/src/third_party/moz.build b/ipc/chromium/src/third_party/moz.build
index 6572d01aa9..4a7dfd3fd1 100644
--- a/ipc/chromium/src/third_party/moz.build
+++ b/ipc/chromium/src/third_party/moz.build
@@ -7,7 +7,7 @@
 libevent_path_prefix = '.'
 include(libevent_path_prefix + '/libeventcommon.mozbuild')
 
-if os_win:
+if CONFIG["TARGET_KERNEL"] == "WINNT":
     error('should not reach here on Windows')
 
 if CONFIG['MOZ_SYSTEM_LIBEVENT']:
@@ -42,12 +42,12 @@ SOURCES += [
     # 'libevent/evrpc.c', # Unused file. # conflicting TAILQ_ENTRY definition
 ]
 
-if os_macosx or os_bsd:
+if CONFIG["TARGET_KERNEL"] in ("Darwin", "DragonFly", "FreeBSD", "NetBSD", "OpenBSD"):
     UNIFIED_SOURCES += [
         'libevent/kqueue.c',
     ]
 
-if os_linux:
+if CONFIG["TARGET_KERNEL"] == "Linux":
     UNIFIED_SOURCES += [
         'libevent/epoll.c',
     ]
@@ -56,7 +56,7 @@ if os_linux:
             'libevent/epoll_sub.c',
         ]
 
-if os_solaris:
+if CONFIG["TARGET_KERNEL"] == "SunOS":
     SOURCES += [
         'libevent/devpoll.c',
         'libevent/evport.c',