From 21d4f3a3564c5633ccbce8e75648fa36a2e57388 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 15 May 2016 18:33:06 +0200 Subject: ghostscript: url was changed upstream --- var/spack/repos/builtin/packages/ghostscript/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index ba787f858f..3a121111a3 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -27,7 +27,7 @@ from spack import * class Ghostscript(Package): """an interpreter for the PostScript language and for PDF. """ homepage = "http://ghostscript.com/" - url = "http://downloads.ghostscript.com/public/ghostscript-9.16.tar.gz" + url = "http://downloads.ghostscript.com/public/old-gs-releases/ghostscript-9.16.tar.gz" version('9.16', '829319325bbdb83f5c81379a8f86f38f') @@ -38,4 +38,3 @@ class Ghostscript(Package): make() make("install") - -- cgit v1.2.3-70-g09d2 From a045154b5eda7c4d44d3e3b24fe4369c38b1aed4 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 15 May 2016 18:34:50 +0200 Subject: graphviz: add missing dependency and fix installation on darwin --- var/spack/repos/builtin/packages/graphviz/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 203e7b7f3c..a527d7ae50 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys class Graphviz(Package): """Graph Visualization Software""" @@ -42,12 +43,20 @@ class Graphviz(Package): depends_on("swig") depends_on("python") depends_on("ghostscript") + depends_on("pkg-config") def install(self, spec, prefix): options = ['--prefix=%s' % prefix] if not '+perl' in spec: options.append('--disable-perl') + # On OSX fix the compiler error: + # In file included from tkStubLib.c:15: + # /usr/include/tk.h:78:11: fatal error: 'X11/Xlib.h' file not found + # include + if sys.platform == 'darwin': + options.append('CFLAGS=-I/opt/X11/include') + configure(*options) make() make("install") -- cgit v1.2.3-70-g09d2 From 459c647bc97617f2334334c2c59e979f5b15fbef Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 15 May 2016 18:36:45 +0200 Subject: doxygen: add graphviz variant; enable flex and bison on OSX and they build fine --- var/spack/repos/builtin/packages/doxygen/package.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index b8f15dee14..d6b72af2f9 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -22,10 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - -# Author: Justin Too -# Date: September 11, 2015 - from spack import * import sys @@ -43,10 +39,15 @@ class Doxygen(Package): version('1.8.11', 'f4697a444feaed739cfa2f0644abc19b') version('1.8.10', '79767ccd986f12a0f949015efb5f058f') + # graphviz appears to be a run-time optional dependency + variant('graphviz', default=True, description='Build with dot command support from Graphviz.') + depends_on("cmake@2.8.12:") - # flex does not build on OSX, but it's provided there anyway - depends_on("flex", sys.platform != 'darwin') - depends_on("bison", sys.platform != 'darwin') + depends_on("flex") + depends_on("bison") + + #optional dependencies + depends_on("graphviz", when="+graphviz") def install(self, spec, prefix): cmake('.', *std_cmake_args) -- cgit v1.2.3-70-g09d2 From 0fbf70d95de9fda8dd622a13130575914482bc86 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 15 May 2016 23:11:49 +0200 Subject: indentation fixes --- var/spack/repos/builtin/packages/doxygen/package.py | 5 ++--- var/spack/repos/builtin/packages/ghostscript/package.py | 3 ++- var/spack/repos/builtin/packages/graphviz/package.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index d6b72af2f9..b2e9582b5a 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import sys class Doxygen(Package): @@ -40,13 +39,13 @@ class Doxygen(Package): version('1.8.10', '79767ccd986f12a0f949015efb5f058f') # graphviz appears to be a run-time optional dependency - variant('graphviz', default=True, description='Build with dot command support from Graphviz.') + variant('graphviz', default=True, description='Build with dot command support from Graphviz.') # NOQA: ignore=E501 depends_on("cmake@2.8.12:") depends_on("flex") depends_on("bison") - #optional dependencies + # optional dependencies depends_on("graphviz", when="+graphviz") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index 3a121111a3..707f65c902 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * + class Ghostscript(Package): """an interpreter for the PostScript language and for PDF. """ homepage = "http://ghostscript.com/" @@ -34,7 +35,7 @@ class Ghostscript(Package): parallel = False def install(self, spec, prefix): - configure("--prefix=%s" %prefix, "--enable-shared") + configure("--prefix=%s" % prefix, "--enable-shared") make() make("install") diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index a527d7ae50..2f99015ba2 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -25,6 +25,7 @@ from spack import * import sys + class Graphviz(Package): """Graph Visualization Software""" homepage = "http://www.graphviz.org" @@ -36,7 +37,7 @@ class Graphviz(Package): # related to missing Perl packages. If spack begins support for Perl in the # future, this package can be updated to depend_on('perl') and the # ncecessary devel packages. - variant('perl', default=False, description='Enable if you need the optional Perl language bindings.') + variant('perl', default=False, description='Enable if you need the optional Perl language bindings.') # NOQA: ignore=E501 parallel = False @@ -47,7 +48,7 @@ class Graphviz(Package): def install(self, spec, prefix): options = ['--prefix=%s' % prefix] - if not '+perl' in spec: + if '+perl' not in spec: options.append('--disable-perl') # On OSX fix the compiler error: -- cgit v1.2.3-70-g09d2