From 70f1e929513dd2290a73684b30ec0284c118ba4e Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sun, 11 Dec 2016 20:35:57 +0100 Subject: Update Adol-C package (#2556) Rename developer version, add new version, and make patch version specific. --- var/spack/repos/builtin/packages/adol-c/openmp_exam.patch | 13 ------------- .../repos/builtin/packages/adol-c/openmp_exam_261.patch | 13 +++++++++++++ var/spack/repos/builtin/packages/adol-c/package.py | 5 +++-- 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/adol-c/openmp_exam.patch create mode 100644 var/spack/repos/builtin/packages/adol-c/openmp_exam_261.patch diff --git a/var/spack/repos/builtin/packages/adol-c/openmp_exam.patch b/var/spack/repos/builtin/packages/adol-c/openmp_exam.patch deleted file mode 100644 index 8e21c72d92..0000000000 --- a/var/spack/repos/builtin/packages/adol-c/openmp_exam.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp b/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp -index fc6fc28..14103d2 100644 ---- a/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp -+++ b/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp -@@ -27,7 +27,7 @@ using namespace std; - #include - #include - --#include "adolc.h" -+#include - - #ifdef _OPENMP - #include diff --git a/var/spack/repos/builtin/packages/adol-c/openmp_exam_261.patch b/var/spack/repos/builtin/packages/adol-c/openmp_exam_261.patch new file mode 100644 index 0000000000..8e21c72d92 --- /dev/null +++ b/var/spack/repos/builtin/packages/adol-c/openmp_exam_261.patch @@ -0,0 +1,13 @@ +diff --git a/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp b/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp +index fc6fc28..14103d2 100644 +--- a/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp ++++ b/ADOL-C/examples/additional_examples/openmp_exam/liborpar.cpp +@@ -27,7 +27,7 @@ using namespace std; + #include + #include + +-#include "adolc.h" ++#include + + #ifdef _OPENMP + #include diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index c5d53de230..5c8d894757 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -32,7 +32,8 @@ class AdolC(Package): homepage = "https://projects.coin-or.org/ADOL-C" url = "http://www.coin-or.org/download/source/ADOL-C/ADOL-C-2.6.1.tgz" - version('head', svn='https://projects.coin-or.org/svn/ADOL-C/trunk/') + version('develop', svn='https://projects.coin-or.org/svn/ADOL-C/trunk/') + version('2.6.2', '0f9547584c99c0673e4f81cf64e8d865') version('2.6.1', '1032b28427d6e399af4610e78c0f087b') variant('doc', default=True, description='Install documentation') @@ -41,7 +42,7 @@ class AdolC(Package): variant('tests', default=True, description='Build all included examples as a test case') - patch('openmp_exam.patch') + patch('openmp_exam_261.patch', when='@2.6.1') def install(self, spec, prefix): make_args = ['--prefix=%s' % prefix] -- cgit v1.2.3-70-g09d2