mirror of
https://github.com/LCPQ/quantum_package
synced 2024-12-22 12:23:48 +01:00
Merge pull request #179 from barrymoo/allow_non-default_opamroot
Allow for non-default OPAMROOT locations
This commit is contained in:
commit
bdd71bcaff
12
configure
vendored
12
configure
vendored
@ -496,15 +496,21 @@ def create_ninja_and_rc(l_installed):
|
|||||||
'export LIBRARY_PATH="${QP_ROOT}"/lib:"${LIBRARY_PATH}"',
|
'export LIBRARY_PATH="${QP_ROOT}"/lib:"${LIBRARY_PATH}"',
|
||||||
'export C_INCLUDE_PATH="${C_INCLUDE_PATH}":"${QP_ROOT}"/include',
|
'export C_INCLUDE_PATH="${C_INCLUDE_PATH}":"${QP_ROOT}"/include',
|
||||||
'',
|
'',
|
||||||
'source ${QP_ROOT}/install/EZFIO/Bash/ezfio.sh', "",
|
'source ${QP_ROOT}/install/EZFIO/Bash/ezfio.sh',
|
||||||
'source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true',
|
|
||||||
'',
|
'',
|
||||||
'# Choose the correct network interface',
|
'# Choose the correct network interface',
|
||||||
'# export QP_NIC=ib0',
|
'# export QP_NIC=ib0',
|
||||||
'# export QP_NIC=eth0',
|
'# export QP_NIC=eth0',
|
||||||
""
|
''
|
||||||
]
|
]
|
||||||
|
|
||||||
|
qp_opam_root = os.getenv('OPAMROOT')
|
||||||
|
if not qp_opam_root:
|
||||||
|
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('')
|
||||||
|
|
||||||
path = join(QP_ROOT, "quantum_package.rc")
|
path = join(QP_ROOT, "quantum_package.rc")
|
||||||
with open(path, "w+") as f:
|
with open(path, "w+") as f:
|
||||||
f.write("\n".join(l_rc))
|
f.write("\n".join(l_rc))
|
||||||
|
Loading…
Reference in New Issue
Block a user