diff options
| author | George Hartzell <hartzell@alerce.com> | 2016-11-30 13:49:49 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-11-30 15:49:49 -0600 |
| commit | 8ab69c4d322d541cf33d3ca32d48eb1e3ac74970 (patch) | |
| tree | 1f03694ce40dad65322baf3aa4154c8aee4a000c /var | |
| parent | 6cc9b3174720057b9814c64259b6dc033623d048 (diff) | |
| download | spack-8ab69c4d322d541cf33d3ca32d48eb1e3ac74970.tar.gz spack-8ab69c4d322d541cf33d3ca32d48eb1e3ac74970.tar.bz2 spack-8ab69c4d322d541cf33d3ca32d48eb1e3ac74970.tar.xz spack-8ab69c4d322d541cf33d3ca32d48eb1e3ac74970.zip | |
Update R&friends to use our X11 libs (#2053)
* 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.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/R/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cairo/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/tk/package.py | 3 |
3 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/R/package.py index a0899084d0..000e337ce0 100644 --- a/var/spack/repos/builtin/packages/R/package.py +++ b/var/spack/repos/builtin/packages/R/package.py @@ -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') diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 12c7838f63..fce7da3f17 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index 894d3af6cc..12a7049e72 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -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" |