diff options
| author | bryanherman <63422190+bryanherman@users.noreply.github.com> | 2021-01-23 15:33:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 10:33:39 -0500 |
| commit | 5a2fe8add38e5c088c74bd520f40f7ace27eadce (patch) | |
| tree | dca94167a85b59ad2c3bfb653829351930c6b9d4 | |
| parent | dba6a26920f9d6392be10acbddfc2666a21129c9 (diff) | |
| download | spack-5a2fe8add38e5c088c74bd520f40f7ace27eadce.tar.gz spack-5a2fe8add38e5c088c74bd520f40f7ace27eadce.tar.bz2 spack-5a2fe8add38e5c088c74bd520f40f7ace27eadce.tar.xz spack-5a2fe8add38e5c088c74bd520f40f7ace27eadce.zip | |
Fix git svn modules (#21169)
* added Git run env to support svn variant modules
* perl-alien-svn needs arp-util to be link
* Update var/spack/repos/builtin/packages/git/package.py
| -rw-r--r-- | var/spack/repos/builtin/packages/git/package.py | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/perl-alien-svn/package.py | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index dbc13e879f..032b48320c 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -305,3 +305,14 @@ class Git(AutotoolsPackage): install_tree('man1', prefix.share.man.man1) install_tree('man5', prefix.share.man.man5) install_tree('man7', prefix.share.man.man7) + + def setup_run_environment(self, env): + # Setup run environment if using SVN extension + # Libs from perl-alien-svn and apr-util are required in + # LD_LIBRARY_PATH + # TODO: extend to other platforms + if "+svn platform=linux" in self.spec: + perl_svn = self.spec['perl-alien-svn'] + env.prepend_path('LD_LIBRARY_PATH', join_path( + perl_svn.prefix, 'lib', 'perl5', 'x86_64-linux-thread-multi', + 'Alien', 'SVN')) diff --git a/var/spack/repos/builtin/packages/perl-alien-svn/package.py b/var/spack/repos/builtin/packages/perl-alien-svn/package.py index 0c4b3b4210..4daa44afc9 100644 --- a/var/spack/repos/builtin/packages/perl-alien-svn/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-svn/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import sys from spack import * @@ -23,7 +24,7 @@ class PerlAlienSvn(PerlPackage): depends_on('perl-module-build', type='build') depends_on('apr@1.6.2', type='build') - depends_on('apr-util', type='build') + depends_on('apr-util', type=('build', 'link')) depends_on('sqlite', type='build') depends_on('zlib') depends_on('libbsd') @@ -34,6 +35,8 @@ class PerlAlienSvn(PerlPackage): def setup_run_environment(self, env): # SVN libs are not RPATHed correctly... - env.prepend_path('LD_LIBRARY_PATH', join_path( - self.prefix, 'lib', 'perl5', 'x86_64-linux-thread-multi', - 'Alien', 'SVN')) + # TODO: extend to other plaforms + if sys.platform.startswith('linux'): + env.prepend_path('LD_LIBRARY_PATH', join_path( + self.prefix, 'lib', 'perl4', 'x86_64-linux-thread-multi', + 'Alien', 'SVN')) |