Bug 1523312 - build msgpack separately from libprio r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D21076

--HG--
extra : moz-landing-system : lando

config/external/moz.build

@@ -14,7 +14,8 @@ 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...

config/external/msgpack/moz.build

@@ -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']

config/external/prio/moz.build

@@ -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']
-

third_party/msgpack/moz.build

@@ -12,17 +12,18 @@ LOCAL_INCLUDES += [
 
 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'

third_party/prio/moz.build

@@ -30,14 +30,6 @@ SOURCES += [
     '/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',