From 085ca7392badfbce56b3b3212b24f5c0252bc720 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Wed, 8 Feb 2017 08:33:49 -0800 Subject: [PATCH] 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. --- var/spack/repos/builtin/packages/qt/package.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 7552635bcb7..68e5f5a2bb6 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -227,12 +227,10 @@ def common_config_args(self): @when('@3') def configure(self): # 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 - # and set LD_LIBRARY_PATH if not set, update if it is set. - if not os.environ.get('LD_LIBRARY_PATH'): - os.environ['LD_LIBRARY_PATH'] = os.pathsep + os.getcwd() + '/lib' - else: - os.environ['LD_LIBRARY_PATH'] += os.pathsep + os.getcwd() + '/lib' + # The previous change tried to append to LD_LIBRARY_PATH, but since + # spack clears LD_LIBRARY_PATH do not append to the LD_LIBRARY_PATH + # instead set LD_LIBRARY_PATH. + os.environ['LD_LIBRARY_PATH'] = os.pathsep + os.getcwd() + '/lib' configure('-prefix', self.prefix, '-v',