Merge pull request #28 in SCALE/spack from bugfix/scipy to develop

# By Gregory L. Lee
# Via Gregory L. Lee
* commit '2c3e7a6f87ef5f8b5ba154b5a8b7da7a119f4a67':
  added graphviz dependency and dysect variant to STAT
  added graphviz and dependencies
  use filter_file instead of patch
  added lapack and blas deps, fixed gfortran compiler dependency

6 files changed, 80 insertions, 3 deletions

diff --git a/var/spack/packages/ghostscript/package.py b/var/spack/packages/ghostscript/package.py
new file mode 100644
index 0000000000..0ab49d425f
--- /dev/null
+++ b/var/spack/packages/ghostscript/package.py
@@ -0,0 +1,17 @@
+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"
+
+    version('9.16', '829319325bbdb83f5c81379a8f86f38f')
+
+    parallel = False
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" %prefix, "--enable-shared")
+
+        make()
+        make("install")
+
diff --git a/var/spack/packages/graphviz/package.py b/var/spack/packages/graphviz/package.py
new file mode 100644
index 0000000000..7af7da1881
--- /dev/null
+++ b/var/spack/packages/graphviz/package.py
@@ -0,0 +1,21 @@
+from spack import *
+
+class Graphviz(Package):
+    """Graph Visualization Software"""
+    homepage = "http://www.graphviz.org"
+    url      = "http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz"
+
+    version('2.38.0', '5b6a829b2ac94efcd5fa3c223ed6d3ae')
+
+    parallel = False
+
+    depends_on("swig")
+    depends_on("python")
+    depends_on("ghostscript")
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" %prefix)
+
+        make()
+        make("install")
+
diff --git a/var/spack/packages/pkg-config/package.py b/var/spack/packages/pkg-config/package.py
new file mode 100644
index 0000000000..9964c6ce34
--- /dev/null
+++ b/var/spack/packages/pkg-config/package.py
@@ -0,0 +1,17 @@
+from spack import *
+
+class PkgConfig(Package):
+    """pkg-config is a helper tool used when compiling applications and libraries"""
+    homepage = "http://www.freedesktop.org/wiki/Software/pkg-config/"
+    url      = "http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"
+
+    version('0.28', 'aa3c86e67551adc3ac865160e34a2a0d')
+
+    parallel = False
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" %prefix, "--enable-shared")
+
+        make()
+        make("install")
+
diff --git a/var/spack/packages/py-numpy/package.py b/var/spack/packages/py-numpy/package.py
index 6534e063d2..efa109a3e9 100644
--- a/var/spack/packages/py-numpy/package.py
+++ b/var/spack/packages/py-numpy/package.py
@@ -7,9 +7,22 @@ class PyNumpy(Package):
 
     version('1.9.1', '78842b73560ec378142665e712ae4ad9')
     version('1.9.2', 'a1ed53432dbcd256398898d35bc8e645')
-
+    
     extends('python')
     depends_on('py-nose')
+    depends_on('netlib-blas+fpic')
+    depends_on('netlib-lapack+shared')
+
+    def patch(self):
+        filter_file(
+            "possible_executables = \['(gfortran|g77|ifort|efl)",
+            "possible_executables = ['fc",
+            "numpy/distutils/fcompiler/gnu.py",
+            "numpy/distutils/fcompiler/intel.py")
 
     def install(self, spec, prefix):
+        with open('site.cfg', 'w') as f:
+            f.write('[DEFAULT]\n')
+            f.write('libraries=lapack,blas\n')
+            f.write('library_dirs=%s/lib:%s/lib\n' % (spec['blas'].prefix, spec['lapack'].prefix))
         python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-scipy/package.py b/var/spack/packages/py-scipy/package.py
index cdcf74534b..3a1124cc15 100644
--- a/var/spack/packages/py-scipy/package.py
+++ b/var/spack/packages/py-scipy/package.py
@@ -11,6 +11,8 @@ class PyScipy(Package):
     extends('python')
     depends_on('py-nose')
     depends_on('py-numpy')
+    depends_on('blas')
+    depends_on('lapack')
 
     def install(self, spec, prefix):
         python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/stat/package.py b/var/spack/packages/stat/package.py
index c40d65ae78..5d81e62731 100644
--- a/var/spack/packages/stat/package.py
+++ b/var/spack/packages/stat/package.py
@@ -9,17 +9,20 @@ class Stat(Package):
     version('2.1.0', 'ece26beaf057aa9134d62adcdda1ba91')
     version('2.0.0', 'c7494210b0ba26b577171b92838e1a9b')
 
+    variant('dysect', default=False, description="enable DySectAPI")
+
     depends_on('libelf')
     depends_on('libdwarf')
     depends_on('dyninst')
     depends_on('graphlib')
+    depends_on('graphviz')
     depends_on('launchmon')
     depends_on('mrnet')
 
     patch('configure_mpicxx.patch', when='@2.1.0')
 
     def install(self, spec, prefix):
-        configure(
+        configure_args = [
             "--enable-gui",
             "--prefix=%s" % prefix,
             "--disable-examples", # Examples require MPI: avoid this dependency.
@@ -27,7 +30,11 @@ class Stat(Package):
             "--with-mrnet=%s"       % spec['mrnet'].prefix,
             "--with-graphlib=%s"    % spec['graphlib'].prefix,
             "--with-stackwalker=%s" % spec['dyninst'].prefix,
-            "--with-libdwarf=%s"    % spec['libdwarf'].prefix)
+            "--with-libdwarf=%s"    % spec['libdwarf'].prefix
+            ]
+        if '+dysect' in spec:
+            configure_args.append('--enable-dysectapi')
+        configure(*configure_args)
 
         make(parallel=False)
         make("install")