diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/libxpm/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py index 7cc339f92c..e4ae82710a 100644 --- a/var/spack/repos/builtin/packages/libxpm/package.py +++ b/var/spack/repos/builtin/packages/libxpm/package.py @@ -26,6 +26,6 @@ class Libxpm(AutotoolsPackage): depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') - def setup_environment(self, spack_env, run_env): - spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format( - self.spec['gettext'].prefix.lib)) +# def setup_environment(self, spack_env, run_env): +# spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format( +# self.spec['gettext'].prefix.lib)) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index f8d7f82791..cd5f7500a2 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -501,12 +501,10 @@ class Root(CMakePackage): self.spec['ftgl'].prefix)) options.append('-DFTGL_INCLUDE_DIR={0}'.format( self.spec['ftgl'].prefix.include)) - # see https://github.com/spack/spack/pull/11579 if '+python' in self.spec: options.append('-DPYTHON_EXECUTABLE=%s' % spec['python'].command.path) - return options def setup_environment(self, spack_env, run_env): |