From a8ab439a92c051ba6aa195f36af2fdaaef9c2cef Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 3 Feb 2023 10:45:40 +0100 Subject: [PATCH] Update configure --- configure | 9 +++++---- external/qp2-dependencies | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 59135126..dc59a9af 100755 --- a/configure +++ b/configure @@ -199,7 +199,7 @@ if [[ "${PACKAGES}.x" != ".x" ]] ; then fi if [[ ${PACKAGES} = all ]] ; then - PACKAGES="zlib ninja zeromq f77zmq gmp ocaml docopt resultsFile bats bse" + PACKAGES="zlib ninja zeromq f77zmq gmp ocaml docopt resultsFile bats" fi @@ -209,7 +209,8 @@ for PACKAGE in ${PACKAGES} ; do execute << EOF rm -f "\${QP_ROOT}"/bin/ninja - unzip "\${QP_ROOT}"/external/qp2-dependencies/ninja-linux.zip -d "\${QP_ROOT}"/bin + tar -zxvf "\${QP_ROOT}"/external/qp2-dependencies/ninja.tar.gz + mv ninja "\${QP_ROOT}"/bin/ EOF @@ -299,8 +300,8 @@ EOF execute << EOF cd "\${QP_ROOT}"/external - tar -zxf qp2-dependencies/bats-v1.7.0.tar.gz - ( cd bats-core-1.7.0/ ; ./install.sh \${QP_ROOT}) + tar -zxf qp2-dependencies/bats-v1.1.0.tar.gz + ( cd bats-core-1.1.0/ ; ./install.sh \${QP_ROOT}) EOF else diff --git a/external/qp2-dependencies b/external/qp2-dependencies index 242151e0..9e5b27ce 160000 --- a/external/qp2-dependencies +++ b/external/qp2-dependencies @@ -1 +1 @@ -Subproject commit 242151e03d1d6bf042387226431d82d35845686a +Subproject commit 9e5b27ce5a174901765cec9db9e7b2aa6170a5de