zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the fix for qt3 build by setting LD_LIBRARY_PATH instead of checking for whether it is set or not per Adams comment that spack clears LD_LIBRARY_PATH.

Browse Source
This commit is contained in:
Jim Galarowicz 2017-02-08 08:33:49 -08:00
parent 60d58613ed
commit 085ca7392b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/qt/package.py
View File

@ -227,12 +227,10 @@ def common_config_args(self):
@when('@3') @when('@3')
def configure(self): def configure(self):
# A user reported that this was necessary to link Qt3 on ubuntu # A user reported that this was necessary to link Qt3 on ubuntu
# However, if LD_LIBRARY_PATH is not set the qt build fails, so check # The previous change tried to append to LD_LIBRARY_PATH, but since
# and set LD_LIBRARY_PATH if not set, update if it is set. # spack clears LD_LIBRARY_PATH do not append to the LD_LIBRARY_PATH
if not os.environ.get('LD_LIBRARY_PATH'): # instead set LD_LIBRARY_PATH.
os.environ['LD_LIBRARY_PATH'] = os.pathsep + os.getcwd() + '/lib' os.environ['LD_LIBRARY_PATH'] = os.pathsep + os.getcwd() + '/lib'
else:
os.environ['LD_LIBRARY_PATH'] += os.pathsep + os.getcwd() + '/lib'
configure('-prefix', self.prefix, configure('-prefix', self.prefix,
'-v', '-v',