From 92b67bf46be0ab70a9d21e19570d2c5f0a32df84 Mon Sep 17 00:00:00 2001
From: Ajanthan Asogamoorthy <aasogamo@fb.com>
Date: Wed, 22 Aug 2018 13:09:27 -0700
Subject: [PATCH] Link in fizz to wangle and wangle's dependencies

Summary: Update cmake configurations + legocastle jobs in order to add fizz as a dependency to wangle

Reviewed By: reanimus

Differential Revision: D9337956

fbshipit-source-id: 40f25694c2b3fd8aa37d254bc63a664f4c8ee526
---
 CMakeLists.txt                         |  1 +
 build/fbcode_builder/specs/fbthrift.py |  4 +++-
 build/fbcode_builder/specs/fizz.py     | 17 +++++++++++++++++
 build/fbcode_builder/specs/proxygen.py |  4 +++-
 build/fbcode_builder/specs/wangle.py   |  4 +++-
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 build/fbcode_builder/specs/fizz.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e4d7e7d178..f11a7cb117f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,7 @@ if(lib_only OR build_all)
   find_package(Glog REQUIRED)
   find_package(Krb5 REQUIRED gssapi)
   find_package(Yarpl)
+  find_package(fizz CONFIG REQUIRED)
   find_package(wangle CONFIG REQUIRED)
   find_package(Zlib REQUIRED)
   find_package(Zstd REQUIRED)
diff --git a/build/fbcode_builder/specs/fbthrift.py b/build/fbcode_builder/specs/fbthrift.py
index 3719a377c2e..5d578b3a34e 100644
--- a/build/fbcode_builder/specs/fbthrift.py
+++ b/build/fbcode_builder/specs/fbthrift.py
@@ -5,6 +5,8 @@
 from __future__ import unicode_literals
 
 import specs.folly as folly
+import specs.fizz as fizz
+import specs.sodium as sodium
 import specs.wangle as wangle
 import specs.zstd as zstd
 
@@ -22,7 +24,7 @@ def fbcode_builder_spec(builder):
     )
     builder.add_option('krb5/krb5:git_hash', 'krb5-1.16.1-final')
     return {
-        'depends_on': [folly, wangle, zstd],
+        'depends_on': [folly, fizz, sodium, wangle, zstd],
         'steps': [
             # This isn't a separete spec, since only fbthrift uses mstch.
             builder.github_project_workdir('no1msd/mstch', 'build'),
diff --git a/build/fbcode_builder/specs/fizz.py b/build/fbcode_builder/specs/fizz.py
new file mode 100644
index 00000000000..ec71f8864b9
--- /dev/null
+++ b/build/fbcode_builder/specs/fizz.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import specs.folly as folly
+import specs.sodium as sodium
+
+
+def fbcode_builder_spec(builder):
+    return {
+        'depends_on': [folly, sodium],
+        'steps': [
+            builder.fb_github_cmake_install('fizz/fizz/build'),
+        ],
+    }
diff --git a/build/fbcode_builder/specs/proxygen.py b/build/fbcode_builder/specs/proxygen.py
index 6cdd8f33f97..e7076a36ebd 100644
--- a/build/fbcode_builder/specs/proxygen.py
+++ b/build/fbcode_builder/specs/proxygen.py
@@ -5,12 +5,14 @@
 from __future__ import unicode_literals
 
 import specs.folly as folly
+import specs.fizz as fizz
+import specs.sodium as sodium
 import specs.wangle as wangle
 
 
 def fbcode_builder_spec(builder):
     return {
-        'depends_on': [folly, wangle],
+        'depends_on': [folly, wangle, fizz, sodium],
         'steps': [
             builder.fb_github_autoconf_install('proxygen/proxygen'),
         ],
diff --git a/build/fbcode_builder/specs/wangle.py b/build/fbcode_builder/specs/wangle.py
index 5df0e0c8453..b4d9c7b5c64 100644
--- a/build/fbcode_builder/specs/wangle.py
+++ b/build/fbcode_builder/specs/wangle.py
@@ -5,13 +5,15 @@
 from __future__ import unicode_literals
 
 import specs.folly as folly
+import specs.fizz as fizz
+import specs.sodium as sodium
 
 
 def fbcode_builder_spec(builder):
     # Projects that simply depend on Wangle need not spend time on tests.
     builder.add_option('wangle/wangle/build:cmake_defines', {'BUILD_TESTS': 'OFF'})
     return {
-        'depends_on': [folly],
+        'depends_on': [folly, fizz, sodium],
         'steps': [
             builder.fb_github_cmake_install('wangle/wangle/build'),
         ],