From 891aa6ad7ae243154da9af2fbcd88f175d4dc047 Mon Sep 17 00:00:00 2001
From: estebanpauli <40901502+estebanpauli@users.noreply.github.com>
Date: Fri, 6 Jul 2018 17:59:34 -0700
Subject: [PATCH] Added support for uncrustify 0.67. (#8655)
* Added support for uncrustify 0.67.
Since the build system changed for uncrustify at version 0.64,
I had to change the package from an AutotoolsPackage to a plain
Package and use @when annotations to build the packages differently.
* Removed blank line at end of file
* Added support for python2.6 in uncrustify configuration.
---
.../builtin/packages/uncrustify/package.py | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py
index 4ef0049c73..a30a7b0ae3 100644
--- a/var/spack/repos/builtin/packages/uncrustify/package.py
+++ b/var/spack/repos/builtin/packages/uncrustify/package.py
@@ -25,10 +25,26 @@
from spack import *
-class Uncrustify(AutotoolsPackage):
+class Uncrustify(Package):
"""Source Code Beautifier for C, C++, C#, ObjectiveC, Java, and others."""
homepage = "http://uncrustify.sourceforge.net/"
url = "http://downloads.sourceforge.net/project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
+ version('0.67', '0c9a08366e5c97cd02ae766064e957de41827611')
version('0.61', 'b6140106e74c64e831d0b1c4b6cf7727')
+
+ depends_on('cmake', type='build', when='@0.64:')
+
+ @when('@0.64:')
+ def install(self, spec, prefix):
+ with working_dir('spack-build', create=True):
+ cmake('..', *std_cmake_args)
+ make()
+ make('install')
+
+ @when('@:0.62')
+ def install(self, spec, prefix):
+ configure('--prefix={0}'.format(self.prefix))
+ make()
+ make('install')
--
GitLab