From e054bcc5da7b6158702353e4a8f279864c855673 Mon Sep 17 00:00:00 2001
From: Jonathan Bendes <jonathan@skyspecs.com>
Date: Wed, 27 Mar 2024 12:56:06 -0400
Subject: [PATCH] Fixed compile

---
 Dockerfile | 17 ++++++++++-------
 wscript    |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3f695f97..00252496 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,13 +33,16 @@ COPY zcm/ ./zcm
 ENV PATH ${PATH}:/root/.local/bin:$ZCM_HOME/deps/julia/bin
 ENV NVM_DIR /root/.nvm
 
-RUN bash -c 'export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") && \
-             [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-             . $ZCM_HOME/deps/cxxtest/.env && \
-             ./waf distclean configure --use-all --use-dev && \
-             ./waf build && \
-             ./waf install && \
-             ./waf build_examples'
+RUN <<EOF
+#!/bin/bash
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+. $ZCM_HOME/deps/cxxtest/.env
+./waf distclean configure --use-all --use-dev
+./waf build
+./waf install
+./waf build_examples
+EOF
 
 CMD bash -c 'export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") && \
              [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
diff --git a/wscript b/wscript
index 85d2fc22..c155f62e 100644
--- a/wscript
+++ b/wscript
@@ -474,7 +474,7 @@ def build(ctx):
         ctx.recurse('gen')
         ctx.recurse('tools')
         ctx.recurse('DEBIAN')
-        ctx.recurse('bench')
+        #ctx.recurse('bench')
         ctx.install_as('${PREFIX}/share/doc/zcm/copyright', 'LICENSE')
         if not waflib.Options.options.skip_git:
             generate_signature(ctx)