From 5328495b85a127a4cff656e7ab0dfaea57dfacc4 Mon Sep 17 00:00:00 2001
From: Evgenii Zhemchugov <evgenii.zhemchugov@cern.ch>
Date: Fri, 17 Feb 2023 13:47:11 +0600
Subject: [PATCH 1/3] GetToolDAQ.sh: zeromq: separate the sources and
 installation directories

Otherwise `install` complains about `include/zmq.h` and
`include/zmq_utils.h` being both source and destination and `make
install` fails.
---
 GetToolDAQ.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/GetToolDAQ.sh b/GetToolDAQ.sh
index ea8631e..34b7f5a 100755
--- a/GetToolDAQ.sh
+++ b/GetToolDAQ.sh
@@ -110,17 +110,22 @@ fi
 
 if [ $zmq -eq 1 ]
 then
-    git clone https://github.com/ToolDAQ/zeromq-4.0.7.git
-    
+    mkdir zeromq-4.0.7
     cd zeromq-4.0.7
+    git clone https://github.com/ToolDAQ/zeromq-4.0.7.git src
+
+    prefix=$PWD
+    cd src
     
-    ./configure --prefix=`pwd`
+    ./configure --prefix="$prefix"
     make -j $threads
     make install
+    cp -v include/zmq.hpp "$prefix/include"
     
-    export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH="$prefix/lib:$LD_LIBRARY_PATH"
+    unset prefix
     
-    cd ../
+    cd ../..
 fi
 
 if [ $boostflag -eq 1 ]

From bebf3eea9df048dd075bf47d380d6a46ead9f943 Mon Sep 17 00:00:00 2001
From: Evgenii Zhemchugov <evgenii.zhemchugov@cern.ch>
Date: Fri, 17 Feb 2023 13:51:45 +0600
Subject: [PATCH 2/3] GetToolDAQ.sh: boost: do not build Boost.Python

Fails to compile against python-3.10.9, and not used in this project.
---
 GetToolDAQ.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GetToolDAQ.sh b/GetToolDAQ.sh
index 34b7f5a..48dc263 100755
--- a/GetToolDAQ.sh
+++ b/GetToolDAQ.sh
@@ -138,7 +138,7 @@ then
     rm -rf INSTALL    
     mkdir install 
     
-    ./bootstrap.sh --prefix=`pwd`/install/  > /dev/null 2>/dev/null
+    ./bootstrap.sh --prefix="`pwd`/install/" --without-libraries=python > /dev/null 2>/dev/null
     ./b2 install iostreams -j $threads
     
     export LD_LIBRARY_PATH=`pwd`/install/lib:$LD_LIBRARY_PATH

From fe9b87b8627122746d178d1e8190063b68684117 Mon Sep 17 00:00:00 2001
From: Evgenii Zhemchugov <evgenii.zhemchugov@cern.ch>
Date: Fri, 17 Feb 2023 13:53:42 +0600
Subject: [PATCH 3/3] GetToolDAQ.sh: do not ignore errors --- stop execution
 upon failure

---
 GetToolDAQ.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/GetToolDAQ.sh b/GetToolDAQ.sh
index 48dc263..b72b534 100755
--- a/GetToolDAQ.sh
+++ b/GetToolDAQ.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 init=1
 tooldaq=1
 boostflag=1