Bug 1523312 - build msgpack separately from libprio r=glandium
authorRobert Helmer <rhelmer@mozilla.com>
Wed, 27 Feb 2019 18:58:37 +0000
changeset 519379 a14f91947d1feb707b28bcdd240134885df45177
parent 519378 060ac202a56e811542392a8d1f0ed6221a81a5ee
child 519380 183e091dee1483a230eb8471aff56b4d573bc0ca
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1523312
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1523312 - build msgpack separately from libprio r=glandium Differential Revision: https://phabricator.services.mozilla.com/D21076
config/external/moz.build
config/external/msgpack/moz.build
config/external/prio/moz.build
third_party/msgpack/moz.build
third_party/prio/moz.build
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -9,17 +9,18 @@ external_dirs = []
 DIRS += [
     'lgpllibs',
     'sqlite',
 ]
 if not CONFIG['MOZ_SYSTEM_JPEG']:
     external_dirs += ['media/libjpeg']
 
 DIRS += [
-    'prio',
+    '/third_party/prio',
+    '/third_party/msgpack',
 ]
 
 # There's no "native" brotli or woff2 yet, but probably in the future...
 external_dirs += ['modules/brotli']
 external_dirs += ['modules/woff2']
 
 external_dirs += ['modules/xz-embedded']
 
deleted file mode 100644
--- a/config/external/msgpack/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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']
deleted file mode 100644
--- a/config/external/prio/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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']
-
--- a/third_party/msgpack/moz.build
+++ b/third_party/msgpack/moz.build
@@ -7,22 +7,23 @@
 DEFINES['MSGPACK_BUILD_LIBRARY'] = True
 
 LOCAL_INCLUDES += [
     'include',
 ]
 
 EXPORTS += [
     'include/msgpack.h',
+    'include/msgpack/util.h',
 ]
 
 # We allow warnings for third-party code that can be updated from upstream.
 AllowCompilerWarnings()
 
 SOURCES += [
-    'objectc.c',
-    'unpack.c',
-    'version.c',
-    'vrefbuffer.c',
-    'zone.c',
+    'src/objectc.c',
+    'src/unpack.c',
+    'src/version.c',
+    'src/vrefbuffer.c',
+    'src/zone.c',
 ]
 
 FINAL_LIBRARY = 'xul'
\ No newline at end of file
--- a/third_party/prio/moz.build
+++ b/third_party/prio/moz.build
@@ -26,24 +26,16 @@ SOURCES += [
     '/security/nss/lib/freebl/mpi/mpcpucache.c',
     '/security/nss/lib/freebl/mpi/mpi.c',
     '/security/nss/lib/freebl/mpi/mplogic.c',
     '/security/nss/lib/freebl/mpi/mpmontg.c',
     '/security/nss/lib/freebl/mpi/mpprime.c',
 ]
 
 SOURCES += [
-    '/third_party/msgpack/src/objectc.c',
-    '/third_party/msgpack/src/unpack.c',
-    '/third_party/msgpack/src/version.c',
-    '/third_party/msgpack/src/vrefbuffer.c',
-    '/third_party/msgpack/src/zone.c',
-]
-
-SOURCES += [
     'prio/client.c',
     'prio/config.c',
     'prio/encrypt.c',
     'prio/mparray.c',
     'prio/poly.c',
     'prio/prg.c',
     'prio/rand.c',
     'prio/serial.c',