diff options
| author | Jean-Paul Pelteret <jppelteret@gmail.com> | 2022-05-02 15:52:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 15:52:38 +0200 |
| commit | b5b62b0c8279df5641c280d7f177dca7384733cb (patch) | |
| tree | a83313727e9972b362f0d8ca7af86ce24a6f26e6 | |
| parent | e691d6df64da5cc22df4b015da5012086929a02d (diff) | |
| download | spack-b5b62b0c8279df5641c280d7f177dca7384733cb.tar.gz spack-b5b62b0c8279df5641c280d7f177dca7384733cb.tar.bz2 spack-b5b62b0c8279df5641c280d7f177dca7384733cb.tar.xz spack-b5b62b0c8279df5641c280d7f177dca7384733cb.zip | |
ADOL-C: Add a patch to force Colpack detection to fail (#30413)
| -rw-r--r-- | var/spack/repos/builtin/packages/adol-c/disable_colpack.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/adol-c/package.py | 7 |
2 files changed, 19 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/adol-c/disable_colpack.patch b/var/spack/repos/builtin/packages/adol-c/disable_colpack.patch new file mode 100644 index 0000000000..e98b762401 --- /dev/null +++ b/var/spack/repos/builtin/packages/adol-c/disable_colpack.patch @@ -0,0 +1,12 @@ +balay@compute-386-07:/scratch/balay/spack-xsdk$ cat var/spack/repos/builtin/packages/adol-c/colpack.patch +--- adol-c/configure.orig 2022-04-28 17:56:45.132919100 -0500 ++++ adol-c/configure 2022-04-28 17:55:07.802506649 -0500 +@@ -18910,7 +18910,7 @@ + else + + COLPACK_CFLAGS="" +-COLPACK_LIBS="-lColPack" ++COLPACK_LIBS="-lColPack_break" + D[0]="" + + fi
\ No newline at end of file diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index 29ae068efa..8b888f079f 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -60,6 +60,13 @@ class AdolC(AutotoolsPackage): # --with-ampi=AMPI_DIR full path to the installation of adjoinable MPI # (AMPI) + # The build system doesn't seem to respect the default flag to disable + # Colpack. When there is an instance of Colpack in path, it will enable + # it which leads to a cascade of unwanted features to be enabled and + # ultimately a compilation failure. + # See https://github.com/xsdk-project/xsdk-examples/issues/16 + patch('disable_colpack.patch', when='@2.7.2:') + patch('openmp_exam_261.patch', when='@2.6.1') def configure_args(self): |