From d3d8f8731bf894dd83e9858f572d69446132d82b Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 27 Mar 2019 22:05:52 +0100 Subject: [PATCH 1/3] Fixing bwrap --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 1e6af5e7..168d0621 100755 --- a/configure +++ b/configure @@ -276,6 +276,7 @@ EOF rm ${QP_ROOT}/external/opam_installer.sh source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true + rm $OPAMROOT/config ${QP_ROOT}/bin/opam init --disable-sandboxing --verbose \ --yes --comp=4.07.0 From a9a4b00afd57c97c8fb045aa510d7070cd548dab Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Thu, 28 Mar 2019 08:56:25 +0100 Subject: [PATCH 2/3] Fixing opam --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 168d0621..13ce8695 100755 --- a/configure +++ b/configure @@ -277,8 +277,7 @@ EOF source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true rm $OPAMROOT/config - ${QP_ROOT}/bin/opam init --disable-sandboxing --verbose \ - --yes --comp=4.07.0 + ${QP_ROOT}/bin/opam init --disable-sandboxing --verbose --yes eval $(${QP_ROOT}/bin/opam env) opam install -y ${OCAML_PACKAGES} || exit 1 From 148add1a73b3c19df983e7abc3f9881cc4e55c4f Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 1 Apr 2019 18:02:34 +0200 Subject: [PATCH 3/3] Fix bug when a blank space precedes program --- 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 3ae929bb..7a148773 100755 --- a/scripts/compilation/qp_create_ninja +++ b/scripts/compilation/qp_create_ninja @@ -538,7 +538,7 @@ def get_binaries(path_module): import subprocess try: - cmd = 'grep -l -e "^program " {0}/*.irp.f'.format(path_module.abs) + cmd = 'grep -l -e "^\\s*program " {0}/*.irp.f'.format(path_module.abs) process = subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE,