summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2016-12-09 19:58:08 +0100
committerTodd Gamblin <tgamblin@llnl.gov>2016-12-09 10:58:08 -0800
commitd7e9134d42d95d6ffe0606ab9c81d462d01ab21a (patch)
tree952b7e12555cd22c7922a0dcf92f8e435603dc50 /var
parent4d0ea423fbf08fb6cbbe5e4ec5dca993833bc397 (diff)
downloadspack-d7e9134d42d95d6ffe0606ab9c81d462d01ab21a.tar.gz
spack-d7e9134d42d95d6ffe0606ab9c81d462d01ab21a.tar.bz2
spack-d7e9134d42d95d6ffe0606ab9c81d462d01ab21a.tar.xz
spack-d7e9134d42d95d6ffe0606ab9c81d462d01ab21a.zip
astyle: do not set user/group when installing on macOS (#2542)
* astyle: do not set user/group when installing on macOS * astyle: add new version
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/astyle/package.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index 31e1efb591..181b9dd31c 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
+import sys
class Astyle(MakefilePackage):
@@ -33,6 +34,7 @@ class Astyle(MakefilePackage):
homepage = "http://astyle.sourceforge.net/"
url = "http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz"
+ version('2.05.1', '4142d178047d7040da3e0e2f1b030a1a')
version('2.04', '30b1193a758b0909d06e7ee8dd9627f6')
parallel = False
@@ -43,6 +45,9 @@ class Astyle(MakefilePackage):
def edit(self, spec, prefix):
makefile = join_path(self.build_directory(), 'Makefile')
filter_file(r'^CXX\s*=.*', 'CXX=%s' % spack_cxx, makefile)
+ # strangely enough install -o $(USER) -g $(USER) stoped working on OSX
+ if sys.platform == 'darwin':
+ filter_file(r'^INSTALL=.*', 'INSTALL=install', makefile)
def install_args(self):
return ['prefix={0}'.format(prefix)]