From 85ba1583d517fa85044af8e1c48d7d4d82814344 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 18 Apr 2023 14:45:44 +0200 Subject: [PATCH 1/4] Fix configure for Linux --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d4e27ede..3dd03017 100755 --- a/configure +++ b/configure @@ -226,7 +226,7 @@ EOF cd "\${QP_ROOT}"/external tar --gunzip --extract --file qp2-dependencies/zeromq-4.2.5.tar.gz cd zeromq-* - [[ ${SYSTEM} = Darwin ]] && ./autogen.sh + [[ "${SYSTEM}" = "Darwin" ]] && ./autogen.sh ./configure --prefix="\$QP_ROOT" --without-libsodium --enable-libunwind=no make -j 8 make install From 3632cb9c706f602a78954dddcba4ad3b26edea5b Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 18 Apr 2023 14:52:03 +0200 Subject: [PATCH 2/4] Fix -lzmq --- scripts/compilation/qp_create_ninja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/compilation/qp_create_ninja b/scripts/compilation/qp_create_ninja index aa93afb3..167dbca9 100755 --- a/scripts/compilation/qp_create_ninja +++ b/scripts/compilation/qp_create_ninja @@ -40,7 +40,7 @@ from qp_path import QP_ROOT, QP_SRC, QP_EZFIO LIB = " -lz" EZFIO_LIB = join("$QP_ROOT", "lib", "libezfio_irp.a") -ZMQ_LIB = "-lzmq -lf77zmq" +ZMQ_LIB = "-lf77zmq -lzmq" #ZMQ_LIB = join("$QP_ROOT", "lib", "libf77zmq.a") + " " + join("$QP_ROOT", "lib", "libzmq.a") + " -lstdc++ -lrt -ldl" ROOT_BUILD_NINJA = join("$QP_ROOT", "config", "build.ninja") ROOT_BUILD_NINJA_EXP = join(QP_ROOT, "config", "build.ninja") From 2bd1a07b6cdc9ae367722cf15ad65eb77caebbad Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 18 Apr 2023 15:55:43 +0200 Subject: [PATCH 3/4] Fix zcat --- bin/zcat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/zcat b/bin/zcat index ae11ce84..715d4842 100755 --- a/bin/zcat +++ b/bin/zcat @@ -17,6 +17,6 @@ EOF fi else command=$(which -a zcat | grep -v 'qp2/bin/' | head -1) - exec command + exec $command $@ fi From f66ee4343abb41c993727982424d3a17972b3aa0 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 18 Apr 2023 16:02:43 +0200 Subject: [PATCH 4/4] Fixed minor bugs --- scripts/module/create_executables_list.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/module/create_executables_list.sh b/scripts/module/create_executables_list.sh index 74880249..41d8853d 100755 --- a/scripts/module/create_executables_list.sh +++ b/scripts/module/create_executables_list.sh @@ -11,7 +11,11 @@ fi cd ${QP_ROOT}/data rm -f executables +if [[ "$(uname -s)" = "Darwin" ]] ; then EXES=$(find -L ${QP_ROOT}/src -maxdepth 2 -depth -perm +111 -type f | grep -e "${QP_ROOT}/src/[^/]*/[^/]*$" |sort ) +else +EXES=$(find -L ${QP_ROOT}/src -maxdepth 2 -depth -executable -type f | grep -e "${QP_ROOT}/src/[^/]*/[^/]*$" |sort ) +fi for EXE in $EXES do