returning flux to a building state for web release

Flux package reworked to include all new dependencies, fixed issues with a
clean-build of hwloc, lua and czmq as well that prevented flux from building
cold on a minimal system.

4 files changed, 24 insertions, 5 deletions

diff --git a/var/spack/packages/czmq/package.py b/var/spack/packages/czmq/package.py
index a2f1947554..0665332179 100644
--- a/var/spack/packages/czmq/package.py
+++ b/var/spack/packages/czmq/package.py
@@ -1,4 +1,5 @@
 from spack import *
+import os
 
 class Czmq(Package):
     """ A C interface to the ZMQ library """
@@ -7,11 +8,24 @@ class Czmq(Package):
 
     version('3.0.2', '23e9885f7ee3ce88d99d0425f52e9be1', url='https://github.com/zeromq/czmq/archive/v3.0.2.tar.gz')
 
+    depends_on('libtool')
+    depends_on('automake')
+    depends_on('autoconf')
+    depends_on('pkg-config')
     depends_on('zeromq')
 
     def install(self, spec, prefix):
         bash = which("bash")
-        bash("./autogen.sh")
+        # Work around autogen.sh oddities
+        # bash("./autogen.sh")
+        mkdirp("config")
+        autoreconf = which("autoreconf")
+        autoreconf("--install", "--verbose", "--force",
+        "-I", "config",
+        "-I", os.path.join(spec['pkg-config'].prefix, "share", "aclocal"),
+        "-I", os.path.join(spec['automake'].prefix, "share", "aclocal"),
+        "-I", os.path.join(spec['libtool'].prefix, "share", "aclocal"),
+        )
         configure("--prefix=%s" % prefix)
 
         make()
diff --git a/var/spack/packages/flux/package.py b/var/spack/packages/flux/package.py
index c128f46be8..dc4e0594c5 100644
--- a/var/spack/packages/flux/package.py
+++ b/var/spack/packages/flux/package.py
@@ -12,20 +12,23 @@ class Flux(Package):
     # Also needs autotools, but should use the system version if available
     depends_on("zeromq@4.0.4:")
     depends_on("czmq@2.2:")
+    depends_on("hwloc")
     depends_on("lua@5.1:5.1.99")
     depends_on("munge")
     depends_on("libjson-c")
     depends_on("libxslt")
+    depends_on("python")
+    depends_on("py-cffi")
+
     # TODO: This provides a catalog, hacked with environment below for now
     depends_on("docbook-xml")
     depends_on("asciidoc")
-    depends_on("python")
-    depends_on("py-cffi")
 
     def install(self, spec, prefix):
         # Bootstrap with autotools
         bash = which('bash')
         bash('./autogen.sh')
+        bash('./autogen.sh') #yes, twice, intentionally
 
         # Fix asciidoc dependency on xml style sheets and whatnot
         os.environ['XML_CATALOG_FILES'] = os.path.join(spec['docbook-xml'].prefix,
diff --git a/var/spack/packages/hwloc/package.py b/var/spack/packages/hwloc/package.py
index 2f46399afd..452a7d7ce3 100644
--- a/var/spack/packages/hwloc/package.py
+++ b/var/spack/packages/hwloc/package.py
@@ -19,6 +19,8 @@ class Hwloc(Package):
             url='http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.1.tar.bz2')
     version('1.9', '1f9f9155682fe8946a97c08896109508')
 
+    depends_on('libpciaccess')
+
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
 
diff --git a/var/spack/packages/lua/package.py b/var/spack/packages/lua/package.py
index fa4b4f9edc..6d8f7806d9 100644
--- a/var/spack/packages/lua/package.py
+++ b/var/spack/packages/lua/package.py
@@ -21,8 +21,8 @@ class Lua(Package):
 
     def install(self, spec, prefix):
         make('INSTALL_TOP=%s' % prefix,
-             'MYLDFLAGS=-L%s/lib' % spec['ncurses'].prefix,
+             'MYLDFLAGS="-L%s/lib -Wl,-rpath,%s"' % (spec['ncurses'].prefix,spec['ncurses'].prefix),
              'linux')
         make('INSTALL_TOP=%s' % prefix,
-             'MYLDFLAGS=-L%s/lib' % spec['ncurses'].prefix,
+             'MYLDFLAGS="-L%s/lib -Wl,-rpath,%s"' % (spec['ncurses'].prefix,spec['ncurses'].prefix),
              'install')