Merge branch 'khuck-develop' into develop, github PR #136

var/spack/packages/apex/package.py

+from spack import *
+from spack.util.environment import *
+
+class Apex(Package):
+    homepage = "http://github.com/khuck/xpress-apex"
+    #url      = "http://github.com/khuck/xpress-apex/archive/v0.1-release-candidate.tar.gz"
+    url      = "http://github.com/khuck/xpress-apex"
+
+    #version('0.1', '6e039c224387348296739f6bf360d081')
+    #version('master', branch='master', git='https://github.com/khuck/xpress-apex.git')
+    version('2015-10-21', git='https://github.com/khuck/xpress-apex.git', commit='d2e66ddde689120472fc57fc546d8cd80aab745c')
+
+    depends_on("binutils+libiberty")
+    depends_on("boost@1.54:")
+    depends_on("cmake@2.8.12:")
+    depends_on("activeharmony@4.5:")
+    depends_on("ompt-openmp")
+
+    def install(self, spec, prefix):
+
+        path=get_path("PATH")
+        path.remove(spec["binutils"].prefix.bin)
+        path_set("PATH", path)
+        with working_dir("build", create=True):
+            cmake('-DBOOST_ROOT=%s' % spec['boost'].prefix,
+                '-DUSE_BFD=TRUE', 
+                '-DBFD_ROOT=%s' % spec['binutils'].prefix,
+                '-DUSE_ACTIVEHARMONY=TRUE', 
+                '-DACTIVEHARMONY_ROOT=%s' % spec['activeharmony'].prefix,
+                '-DUSE_OMPT=TRUE', 
+                '-DOMPT_ROOT=%s' % spec['ompt-openmp'].prefix,
+                '..', *std_cmake_args)
+            make()
+            make("install")

var/spack/packages/binutils/package.py

@@ -18,6 +18,7 @@ def install(self, spec, prefix):
             '--disable-dependency-tracking',
             '--enable-interwork',
             '--enable-multilib',
+            '--enable-shared',
             '--enable-64-bit-bfd',
             '--enable-targets=all']
 

var/spack/packages/ompt-openmp/package.py

+from spack import *
+
+class OmptOpenmp(Package):
+    """LLVM/Clang OpenMP runtime with OMPT support. This is a fork of the OpenMPToolsInterface/LLVM-openmp fork of the official LLVM OpenMP mirror.  This library provides a drop-in replacement of the OpenMP runtimes for GCC, Intel and LLVM/Clang."""
+    homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp"
+    url      = "http://github.com/khuck/LLVM-openmp/archive/v0.1-spack.tar.gz"
+
+    version('spack', '35227b2726e377faa433fc841226e036')
+
+    # depends_on("foo")
+
+    def install(self, spec, prefix):
+        with working_dir("runtime/build", create=True):
+
+            # FIXME: Modify the configure line to suit your build system here.
+            cmake('-DCMAKE_C_COMPILER=%s' % self.compiler.cc, 
+                  '-DCMAKE_CXX_COMPILER=%s' % self.compiler.cxx,
+                  '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
+                  '..', *std_cmake_args)
+
+            # FIXME: Add logic to build and install here
+            make()
+            make("install")