hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix log4cxx dependencies (#7570)

Browse source 
* Add ignore_conflicts to package activation

includes:
* with_dependency flag for do_activate
* ignore_conflicts flag for do_activate
* start of cleanup of activate cmd

* ensure that apr is picked up

* Update package.py

* add apr explicitly as dependency

* remove unnecessary newlines

* Update package.py

fixing dependencies
This commit is contained in:
healther 2018-03-30 21:58:08 +02:00 committed by Adam J. Stewart
parent 9b5492ca19
commit d414d302f6
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
var/spack/repos/builtin/packages/log4cxx/package.py
View file

@ -33,8 +33,9 @@ class Log4cxx(AutotoolsPackage):
version('0.10.0', 'b30ffb8da3665178e68940ff7a61084c') version('0.10.0', 'b30ffb8da3665178e68940ff7a61084c')
depends_on('libxml2')
depends_on('apr-util') depends_on('apr-util')
depends_on('apr')
depends_on('zip')
build_directory = 'spack-build' build_directory = 'spack-build'
@ -43,8 +44,6 @@ class Log4cxx(AutotoolsPackage):
patch('log4cxx-0.10.0-narrowing-fixes-from-upstream.patch') patch('log4cxx-0.10.0-narrowing-fixes-from-upstream.patch')
def configure_args(self): def configure_args(self):
args = ['--disable-static', args = ['--disable-static']
# 'apr''s 'bin' isn't pulled (via apr-util) into build env
'--with-apr={0}'.format(self.spec['apr'].prefix)]
return args return args