From b9d7903cdb1a18b095c0f3e329407640d19908a2 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Thu, 5 Oct 2017 15:53:12 -0700 Subject: Add link dependency on xproto to xau (recent dependency mechanics changes?) (#5624) * Add link dependency on xproto to xau The libxcb build was failing like so: ``` 1 error found in build log: [ ... ] 131 checking whether to build developer documentation... yes 132 checking for doxygen... /usr/bin/doxygen 133 checking for dot... /usr/bin/dot 134 checking for CHECK... no 135 checking for XCBPROTO... yes 136 checking for NEEDED... no >> 137 configure: error: Package requirements (pthread-stubs xau >= 0.99.2) were not met: 138 139 Package 'xproto', required by 'xau', not found 140 141 Consider adjusting the PKG_CONFIG_PATH environment variable if you 142 installed software in a non-standard prefix. 143 ``` This adds a link dependency on libxproto that allows the libxcb build to succeed. * Change more build deps to build, link These were also necessary for emacs+X to build. * Fix flake8 complaint --- var/spack/repos/builtin/packages/libx11/package.py | 4 ++-- var/spack/repos/builtin/packages/libxau/package.py | 2 +- var/spack/repos/builtin/packages/libxrender/package.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index bf741a331a..655132b3a0 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -37,9 +37,9 @@ class Libx11(AutotoolsPackage): depends_on('libxcb@1.1.92:') depends_on('xproto@7.0.17:', type='build') - depends_on('xextproto', type='build') + depends_on('xextproto', type=('build', 'link')) depends_on('xtrans', type='build') - depends_on('kbproto', type='build') + depends_on('kbproto', type=('build', 'link')) depends_on('inputproto', type='build') depends_on('pkg-config@0.9.0:', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py index 0a80e3ce42..9e6c6ad09b 100644 --- a/var/spack/repos/builtin/packages/libxau/package.py +++ b/var/spack/repos/builtin/packages/libxau/package.py @@ -35,6 +35,6 @@ class Libxau(AutotoolsPackage): version('1.0.8', 'a85cd601d82bc79c0daa280917572e20') - depends_on('xproto', type='build') + depends_on('xproto', type=('build', 'link')) depends_on('pkg-config@0.9.0:', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxrender/package.py b/var/spack/repos/builtin/packages/libxrender/package.py index 58416eb600..7a5b38c8c2 100644 --- a/var/spack/repos/builtin/packages/libxrender/package.py +++ b/var/spack/repos/builtin/packages/libxrender/package.py @@ -36,6 +36,6 @@ class Libxrender(AutotoolsPackage): depends_on('libx11@1.6:') - depends_on('renderproto@0.9:', type='build') + depends_on('renderproto@0.9:', type=('build', 'link')) depends_on('pkg-config@0.9.0:', type='build') depends_on('util-macros', type='build') -- cgit v1.2.3-70-g09d2