Major updates integration from all upstreams

src/snark/Makefile

@@ -26,7 +26,7 @@ DEPINST = depinst
 
 CXXFLAGS += -I$(DEPINST)/include -Ilibsnark
 LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath,$(DEPINST)/lib
-LDLIBS += -lgmpxx -lgmp -lboost_program_options-mt -lsodium
+LDLIBS += -lgmpxx -lgmp -lboost_program_options -lsodium
 # List of .a files to include within libsnark.a and libsnark.so:
 AR_LIBS =
 # List of library files to install:
@@ -139,7 +139,10 @@ ifeq ($(PROFILE_OP_COUNTS),1)
 endif
 
 ifeq ($(STATIC),1)
-	CXXFLAGS += -static -DSTATIC
+ifneq ($(PLATFORM),darwin)
+	CXXFLAGS += -static
+endif
+	CXXFLAGS += -DSTATIC
 else
 	CXXFLAGS += -fPIC
 endif