summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-05-10 09:43:44 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-05-10 09:43:44 -0700
commit836d081bca33d4a05b9ff8d1210195941512d81b (patch)
treeadab547122e923bf5764042405349c1a484114b4
parent8fec824484d17cd518f88258285a4e050e86ceab (diff)
parentc8d88607425866413c0d3c931e760c89c01a00fd (diff)
downloadspack-836d081bca33d4a05b9ff8d1210195941512d81b.tar.gz
spack-836d081bca33d4a05b9ff8d1210195941512d81b.tar.bz2
spack-836d081bca33d4a05b9ff8d1210195941512d81b.tar.xz
spack-836d081bca33d4a05b9ff8d1210195941512d81b.zip
Merge pull request #927 from davydden/astyle_fix_ubuntu
astyle: compile with spack_cxx
-rw-r--r--var/spack/repos/builtin/packages/astyle/package.py20
1 files changed, 15 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index 5274fc018f..57083bb947 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -1,8 +1,11 @@
from spack import *
-import os
+
class Astyle(Package):
- """A Free, Fast, and Small Automatic Formatter for C, C++, C++/CLI, Objective-C, C#, and Java Source Code."""
+ """
+ A Free, Fast, and Small Automatic Formatter for C, C++, C++/CLI,
+ Objective-C, C#, and Java Source Code.
+ """
homepage = "http://astyle.sourceforge.net/"
url = "http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz"
@@ -11,8 +14,15 @@ class Astyle(Package):
def install(self, spec, prefix):
with working_dir('src'):
+ # we need to edit the makefile in place to set compiler:
+ make_file = join_path(self.stage.source_path,
+ 'build', 'gcc', 'Makefile')
+ filter_file(r'^CXX\s*=.*', 'CXX=%s'.format(spack_cxx), make_file)
+
make('-f',
- join_path(self.stage.source_path,'build','clang','Makefile'),
- parallel=False)
+ make_file,
+ parallel=False)
+
mkdirp(self.prefix.bin)
- install(join_path(self.stage.source_path, 'src','bin','astyle'), self.prefix.bin)
+ install(join_path(self.stage.source_path, 'src', 'bin', 'astyle'),
+ self.prefix.bin)