diff options
| author | Gregory L. Lee <lee218@llnl.gov> | 2014-03-14 12:04:27 -0700 |
|---|---|---|
| committer | Gregory L. Lee <lee218@llnl.gov> | 2014-03-14 12:04:27 -0700 |
| commit | 759d33ac5baa97b5fdac7929c60728c15b5f24b5 (patch) | |
| tree | b54b0b096c12687f8cc016fdc6db850b55f6cf0a | |
| parent | bb9c5a19cf7ba9f5aea754a3d00fabde89ed6d02 (diff) | |
| download | spack-759d33ac5baa97b5fdac7929c60728c15b5f24b5.tar.gz spack-759d33ac5baa97b5fdac7929c60728c15b5f24b5.tar.bz2 spack-759d33ac5baa97b5fdac7929c60728c15b5f24b5.tar.xz spack-759d33ac5baa97b5fdac7929c60728c15b5f24b5.zip | |
fixes for launchmon build
| -rw-r--r-- | lib/spack/spack/packages/launchmon/__init__.py | 8 | ||||
| -rw-r--r-- | lib/spack/spack/packages/launchmon/patch.lmon_install_dir | 16 |
2 files changed, 23 insertions, 1 deletions
diff --git a/lib/spack/spack/packages/launchmon/__init__.py b/lib/spack/spack/packages/launchmon/__init__.py index 6871a55798..e2b82610fd 100644 --- a/lib/spack/spack/packages/launchmon/__init__.py +++ b/lib/spack/spack/packages/launchmon/__init__.py @@ -30,10 +30,16 @@ class Launchmon(Package): force_url = True list_url = "http://sourceforge.net/p/launchmon/code/HEAD/tree" - versions = {'1.0.0' : 'a0e5bfb7d82dc708d58bdbf93697886c'} + #versions = {'1.0.0' : 'a0e5bfb7d82dc708d58bdbf93697886c'} + versions = {'1.0.0' : '9d1184397d3081b94e2c0577c3c605e5'} patch('patch.lmon_install_dir', level=0) def install(self, spec, prefix): configure("--prefix=" + prefix) + + # TODO: remove once Jira SPACK-19 is fixed + import shutil + shutil.copy2('/usr/bin/libtool', 'libtool') + make() make("install") diff --git a/lib/spack/spack/packages/launchmon/patch.lmon_install_dir b/lib/spack/spack/packages/launchmon/patch.lmon_install_dir index 4a647e8e60..8a1d93fdc9 100644 --- a/lib/spack/spack/packages/launchmon/patch.lmon_install_dir +++ b/lib/spack/spack/packages/launchmon/patch.lmon_install_dir @@ -129,3 +129,19 @@ Index: config/x_ac_bootfabric.m4 if test "x$with_cobo_port" != "xcheck" -a "x$with_cobo_port" != "xyes"; then AC_DEFINE(COBO_BEGIN_PORT, $with_cobo_port, [Define a beginning port for COBO_BASED]) +Index: config/x_ac_gcrpyt.m4 +=================================================================== +--- config/x_ac_gcrypt.m4 2011-10-22 00:50:38.000000000 -0700 ++++ config/x_ac_gcrypt.patched.m4 2014-03-14 11:33:59.189220000 -0700 +@@ -55,8 +55,8 @@ + AC_CONFIG_SUBDIRS([tools/libgpg-error]) + AC_SUBST(GPGERRLOC, [tools/libgpg-error/src]) + AC_SUBST(GCRYPTLOC, [tools/libgcrypt/src]) +- AC_SUBST(LIBGCRYPT, [-lgcrypt]) +- AC_SUBST(LIBGPGERR, [-lgpg-error]) ++ AC_SUBST(LIBGCRYPT, [libgcrypt.la]) ++ AC_SUBST(LIBGPGERR, [libgpg-error.la]) + gcrypt_configured="yes" + else + AC_MSG_ERROR([tools/libgpg-error or tools/libgcrypt not found]) + |