зеркало из https://github.com/mozilla/gecko-dev.git
bug 1485946 - skip building libprio on MSVC r=froydnj
libprio does not currently build with MSVC (since it only supports C90 as a compiler), this is being worked on upstream at https://github.com/mozilla/libprio/issues/17 As we are almost certainly not going to ship Firefox build with MSVC anymore, let's disable this to get it working on this Tier-2 platform. Differential Revision: https://phabricator.services.mozilla.com/D4292 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
0d7183224a
Коммит
70e2c73f5a
|
@ -8,12 +8,16 @@ external_dirs = []
|
|||
|
||||
DIRS += [
|
||||
'lgpllibs',
|
||||
'prio',
|
||||
'sqlite',
|
||||
]
|
||||
if not CONFIG['MOZ_SYSTEM_JPEG']:
|
||||
external_dirs += ['media/libjpeg']
|
||||
|
||||
if CONFIG['MOZ_LIBPRIO']:
|
||||
DIRS += [
|
||||
'prio',
|
||||
]
|
||||
|
||||
# There's no "native" brotli or woff2 yet, but probably in the future...
|
||||
external_dirs += ['modules/brotli']
|
||||
external_dirs += ['modules/woff2']
|
||||
|
|
|
@ -4,5 +4,6 @@
|
|||
# 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/.
|
||||
|
||||
DIRS += ['/third_party/msgpack']
|
||||
if CONFIG['MOZ_LIBPRIO']:
|
||||
DIRS += ['/third_party/msgpack']
|
||||
|
||||
|
|
|
@ -4,5 +4,5 @@
|
|||
# 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/.
|
||||
|
||||
DIRS += ['../../../third_party/prio']
|
||||
DIRS += ['/third_party/prio']
|
||||
|
||||
|
|
|
@ -95,9 +95,11 @@ LOCAL_INCLUDES += [
|
|||
'/media/webrtc/signaling/src/common/time_profiling',
|
||||
'/media/webrtc/signaling/src/peerconnection',
|
||||
'/media/webrtc/trunk/',
|
||||
'/third_party/msgpack/include',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_LIBPRIO']:
|
||||
LOCAL_INCLUDES += ['/third_party/msgpack/include']
|
||||
|
||||
DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
|
||||
DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
|
||||
|
||||
|
|
|
@ -44,7 +44,6 @@ WEBIDL_FILES = [
|
|||
'MozStorageStatementParams.webidl',
|
||||
'MozStorageStatementRow.webidl',
|
||||
'PrecompiledScript.webidl',
|
||||
'PrioEncoder.webidl',
|
||||
'PromiseDebugging.webidl',
|
||||
'StructuredCloneHolder.webidl',
|
||||
'WebExtensionContentScript.webidl',
|
||||
|
@ -58,3 +57,9 @@ if CONFIG['MOZ_PLACES']:
|
|||
'PlacesEvent.webidl',
|
||||
'PlacesObservers.webidl',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_LIBPRIO']:
|
||||
WEBIDL_FILES += [
|
||||
'PrioEncoder.webidl',
|
||||
]
|
||||
|
||||
|
|
|
@ -63,7 +63,6 @@ DIRS += [
|
|||
'notification',
|
||||
'offline',
|
||||
'power',
|
||||
'prio',
|
||||
'push',
|
||||
'quota',
|
||||
'security',
|
||||
|
@ -105,6 +104,9 @@ DIRS += [
|
|||
'simpledb',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_LIBPRIO']:
|
||||
DIRS += ['prio']
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
DIRS += ['plugins/ipc/hangui']
|
||||
|
||||
|
|
|
@ -10,8 +10,9 @@ with Files('rust/**'):
|
|||
with Files('webkit/**'):
|
||||
BUG_COMPONENT = ('Firefox Build System', 'General')
|
||||
|
||||
with Files('prio/**'):
|
||||
BUG_COMPONENT = ('Firefox Build System', 'General')
|
||||
if CONFIG['MOZ_LIBPRIO']:
|
||||
with Files('prio/**'):
|
||||
BUG_COMPONENT = ('Firefox Build System', 'General')
|
||||
|
||||
with Files('msgpack/**'):
|
||||
BUG_COMPONENT = ('Firefox Build System', 'General')
|
||||
with Files('msgpack/**'):
|
||||
BUG_COMPONENT = ('Firefox Build System', 'General')
|
||||
|
|
|
@ -1064,3 +1064,16 @@ def launcher(value, target):
|
|||
|
||||
set_config('MOZ_LAUNCHER_PROCESS', launcher)
|
||||
set_define('MOZ_LAUNCHER_PROCESS', launcher)
|
||||
|
||||
# Prio
|
||||
# ==============================================================
|
||||
@depends(c_compiler)
|
||||
def libprio(info):
|
||||
if info:
|
||||
if info.type in ('msvc'):
|
||||
return None
|
||||
else:
|
||||
return True
|
||||
|
||||
set_config('MOZ_LIBPRIO', libprio)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче