From 3af4913e2dbcdc71d61fd66bb2ed357a7a25ac68 Mon Sep 17 00:00:00 2001 From: Barry Moore Date: Tue, 3 Jan 2017 18:03:39 -0500 Subject: [PATCH 1/4] Minor fix to zlib download --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 128d7126..85b2e146 100755 --- a/configure +++ b/configure @@ -102,7 +102,7 @@ curl = Info( default_path=join(QP_ROOT_BIN, "curl")) zlib = Info( - url='http://zlib.net/zlib-1.2.8.tar.gz', + url='http://www.zlib.net/zlib-1.2.10.tar.gz', description=' zlib', default_path=join(QP_ROOT_LIB, "libz.a")) From ddf798119f9b30792fb7410caf6d70fdce776d15 Mon Sep 17 00:00:00 2001 From: Barry Moore Date: Tue, 3 Jan 2017 18:47:21 -0500 Subject: [PATCH 2/4] Allow for non-default OPAMROOT locations --- configure | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 128d7126..4dc2b42d 100755 --- a/configure +++ b/configure @@ -496,15 +496,22 @@ def create_ninja_and_rc(l_installed): 'export LIBRARY_PATH="${QP_ROOT}"/lib:"${LIBRARY_PATH}"', 'export C_INCLUDE_PATH="${C_INCLUDE_PATH}":"${QP_ROOT}"/include', '', - 'source ${QP_ROOT}/install/EZFIO/Bash/ezfio.sh', "", - 'source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true', + 'source ${QP_ROOT}/install/EZFIO/Bash/ezfio.sh', '', '# Choose the correct network interface', '# export QP_NIC=ib0', '# export QP_NIC=eth0', - "" + '' ] + if os.getenv('OPAMROOT'): + opam_root = os.getenv('OPAMROOT') + l_rc.append('export OPAMROOT={0}'.format(opam_root)) + l_rc.append('source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true') + else: + l_rc.append('source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true') + l_rc.append('') + path = join(QP_ROOT, "quantum_package.rc") with open(path, "w+") as f: f.write("\n".join(l_rc)) From 092992aa495727808a2e20004838048141365767 Mon Sep 17 00:00:00 2001 From: Barry Moore Date: Tue, 3 Jan 2017 19:39:31 -0500 Subject: [PATCH 3/4] Minimize code addition --- configure | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 4dc2b42d..fa7cc461 100755 --- a/configure +++ b/configure @@ -504,12 +504,11 @@ def create_ninja_and_rc(l_installed): '' ] - if os.getenv('OPAMROOT'): - opam_root = os.getenv('OPAMROOT') - l_rc.append('export OPAMROOT={0}'.format(opam_root)) - l_rc.append('source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true') - else: - l_rc.append('source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true') + qp_opam_root = os.getenv('OPAMROOT') + if not qp_opam_root: + qp_opam_root = '${HOME}' + l_rc.append('export QP_OPAM={0}'.format(qp_opam_root)) + l_rc.append('source ${QP_OPAM}/opam-init/init.sh > /dev/null 2> /dev/null || true') l_rc.append('') path = join(QP_ROOT, "quantum_package.rc") From 66dea5e7b89acae171c713a63f7b89f14164c675 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Tue, 3 Jan 2017 19:29:09 -0600 Subject: [PATCH 4/4] Corrected OPAM_PATH --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index fa7cc461..3d672ce7 100755 --- a/configure +++ b/configure @@ -506,7 +506,7 @@ def create_ninja_and_rc(l_installed): qp_opam_root = os.getenv('OPAMROOT') if not qp_opam_root: - qp_opam_root = '${HOME}' + qp_opam_root = '${HOME}/.opam' l_rc.append('export QP_OPAM={0}'.format(qp_opam_root)) l_rc.append('source ${QP_OPAM}/opam-init/init.sh > /dev/null 2> /dev/null || true') l_rc.append('')