From 8d567289844061df13fec9939bdadfd32a3b1f0f Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 11 Apr 2022 17:46:05 +0200 Subject: vmd: remove custom phases --- var/spack/repos/builtin/packages/vmd/package.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/vmd/package.py b/var/spack/repos/builtin/packages/vmd/package.py index f3eeea17be..39aefae96f 100644 --- a/var/spack/repos/builtin/packages/vmd/package.py +++ b/var/spack/repos/builtin/packages/vmd/package.py @@ -26,8 +26,6 @@ class Vmd(Package): url='file://{0}/vmd-1.9.3.bin.LINUXAMD64-CUDA8-OptiX4-OSPRay111p1.opengl.tar.gz'.format(os.getcwd())) manual_download = True - phases = ['configure', 'install'] - depends_on('libx11', type=('run', 'link')) depends_on('libxi', type=('run', 'link')) depends_on('libxinerama', type=('run', 'link')) @@ -38,14 +36,14 @@ class Vmd(Package): env.set('VMDINSTALLBINDIR', self.prefix.bin) env.set('VMDINSTALLLIBRARYDIR', self.prefix.lib64) - def configure(self, spec, prefix): + def install(self, spec, prefix): configure = Executable('./configure') configure('LINUXAMD64') - - def install(self, spec, prefix): with working_dir(join_path(self.stage.source_path, 'src')): make('install') + @run_after('install') + def ensure_rpaths(self): # make sure the executable finds and uses the Spack-provided # libraries, otherwise the executable may or may not run depending # on what is installed on the host -- cgit v1.2.3-70-g09d2