From ee6bb5fd2c02d8345d5a83172368e2877216968b Mon Sep 17 00:00:00 2001 From: AndreaGuarracino Date: Mon, 23 Oct 2023 10:20:43 -0500 Subject: [PATCH 1/3] comment `set -eo pipefail` --- pggb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pggb b/pggb index c3b7b68..88184b5 100755 --- a/pggb +++ b/pggb @@ -1,7 +1,7 @@ #!/usr/bin/env bash # exit when any command fails -set -eo pipefail +#set -eo pipefail # wfmash's default values From 19c8b428192c5beaaf2b3ef08674d15d5c8adfa2 Mon Sep 17 00:00:00 2001 From: AndreaGuarracino Date: Mon, 23 Oct 2023 10:55:09 -0500 Subject: [PATCH 2/3] copy libwfa2cpp and libwfa2 into lib --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index ac5e472..6bc6c58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,11 @@ RUN git clone --recursive https://github.com/waveygang/wfmash \ && sed -i 's/-march=native/-march=sandybridge/g' src/common/wflign/deps/WFA2-lib/Makefile \ && cmake -H. -DCMAKE_BUILD_TYPE=Generic -DEXTRA_FLAGS='-march=sandybridge -Ofast' -Bbuild && cmake --build build -- -j $(nproc) \ && cp build/bin/wfmash /usr/local/bin/wfmash \ + # Libraries aren't getting installed + && cp build/lib/libwfa2cpp.so.0 /usr/local/lib/ \ + && cp build/lib/libwfa2cpp.so /usr/local/lib/ \ + && cp build/lib/libwfa2.so.0 /usr/local/lib/ \ + && cp build/lib/libwfa2.so /usr/local/lib/ \ && cd ../ \ && rm -rf wfmash From 9a7ca17e930fbd0a11b0b0e69f51d732c954be72 Mon Sep 17 00:00:00 2001 From: AndreaGuarracino Date: Mon, 23 Oct 2023 11:20:31 -0500 Subject: [PATCH 3/3] wfmash in docker works again --- pggb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pggb b/pggb index 88184b5..c3b7b68 100755 --- a/pggb +++ b/pggb @@ -1,7 +1,7 @@ #!/usr/bin/env bash # exit when any command fails -#set -eo pipefail +set -eo pipefail # wfmash's default values