zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update R&friends to use our X11 libs (#2053)

Browse Source 
* Update R&friends to use our X11 libs

Add `depends_on()`'s for R, Cairo, and Tk so that they use the Spack X
bits.

* Conditionalize X stuff on variant

Another step towards hooking up the X stuff.

There's still discussion happening on the issue, but this is better
than the 'everything must build with X' state that it was in.
This commit is contained in:
George Hartzell 2016-11-30 13:49:49 -08:00 committed by Todd Gamblin
parent 6cc9b31747
commit 8ab69c4d32
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/R/package.py
View File

@ -50,6 +50,8 @@ class R(Package):
variant('external-lapack', default=False,
description='Links to externally installed BLAS/LAPACK')
variant('X', default=True,
description='Enable X11 support (call configure --with-x)')
# Virtual dependencies
depends_on('blas', when='+external-lapack')
@ -65,10 +67,16 @@ class R(Package):
depends_on('libtiff')
depends_on('jpeg')
depends_on('cairo')
depends_on('cairo+X', when='+X')
depends_on('cairo~X', when='~X')
depends_on('pango')
depends_on('freetype')
depends_on('tcl')
depends_on('tk')
depends_on('tk+X', when='+X')
depends_on('tk~X', when='~X')
depends_on('libx11', when='+X')
depends_on('libxt', when='+X')
depends_on('curl')
depends_on('pcre')
depends_on('jdk')

6
var/spack/repos/builtin/packages/cairo/package.py
View File

@ -33,6 +33,12 @@ class Cairo(AutotoolsPackage):
version('1.14.0', 'fc3a5edeba703f906f2241b394f0cced')
variant('X', default=True, description="Build with X11 support")
depends_on('libx11', when='+X')
depends_on('libxext', when='+X')
depends_on('libxrender', when='+X')
depends_on('libxcb', when='+X')
depends_on("libpng")
depends_on("glib")
depends_on("pixman")

3
var/spack/repos/builtin/packages/tk/package.py
View File

@ -37,7 +37,10 @@ class Tk(Package):
version('8.6.5', '11dbbd425c3e0201f20d6a51482ce6c4')
version('8.6.3', '85ca4dbf4dcc19777fd456f6ee5d0221')
variant('X', default=True, description='Enable X11 support')
depends_on("tcl")
depends_on("libx11", when='+X')
def url_for_version(self, version):
base_url = "http://prdownloads.sourceforge.net/tcl"