Squashed 'cereal/' changes from 12aad06e1..286b7e58b

286b7e58b capitalize docker command
0adfc7e77 add canErrorPersistent event
c8be73d10 use github url instead of gitlab mirror
8e2d212a3 add pre-commit static analysis (#48)
f27222f8f add gpsOK flag to liveLocationKalman
4bb1eb826 submaster always conflates
30838d40a C++ implementation of SubMaster and PubMaster (#42)
c1a6d75d1 Fix potential segfault in MSGQPubSocket::connect (#45)
67fae6afc Use ZMQ on MacOS (#46)
01cdf832c add default values for backwards compat
c96381b0d add OK flags to locationd output
d589d5e3d add white panda deprecation events
856c9812d mark unused car events as deprecated
4f68db8f6 remove unnecessary new event type
9073b9b1b Library cleanup (#43)
7a786d9ce move remaining alerts to car events
d6f10a4b9 add alert event type

git-subtree-dir: cereal
git-subtree-split: 286b7e58b5e7ede697370acc77fc7cca21d69764

SConscript

@@ -20,6 +20,7 @@ if shutil.which('capnpc-java'):
 cereal_objects = env.SharedObject([
     'gen/cpp/car.capnp.c++',
     'gen/cpp/log.capnp.c++',
+    'messaging/socketmaster.cc',
   ])
 
 env.Library('cereal', cereal_objects)
@@ -43,8 +44,10 @@ Depends('messaging/impl_zmq.cc', services_h)
 
 # note, this rebuilds the deps shared, zmq is statically linked to make APK happy
 # TODO: get APK to load system zmq to remove the static link
-shared_lib_shared_lib = [zmq, 'm', 'stdc++'] + ["gnustl_shared"] if arch == "aarch64" else [zmq]
-env.SharedLibrary('messaging_shared', messaging_objects, LIBS=shared_lib_shared_lib)
+if arch == "aarch64":
+  zmq_static = FindFile("libzmq.a", "/usr/lib")
+  shared_lib_shared_lib = [zmq_static, 'm', 'stdc++', "gnustl_shared"]
+  env.SharedLibrary('messaging_shared', messaging_objects, LIBS=shared_lib_shared_lib)
 
 env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[messaging_lib, 'zmq'])
 Depends('messaging/bridge.cc', services_h)