diff options
| author | Todd Kordenbrock <tkordenbrock@users.noreply.github.com> | 2020-10-01 12:38:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 10:38:40 -0700 |
| commit | e0c7f5ae3d1ba22abe1aac3175f6c5dc777df3a5 (patch) | |
| tree | 4b2eaaf016ac4ec3476b285c54f2dee4cd9edd01 | |
| parent | 03790a4f3609f1bedb7dee947c8712b0ab1e3348 (diff) | |
| download | spack-e0c7f5ae3d1ba22abe1aac3175f6c5dc777df3a5.tar.gz spack-e0c7f5ae3d1ba22abe1aac3175f6c5dc777df3a5.tar.bz2 spack-e0c7f5ae3d1ba22abe1aac3175f6c5dc777df3a5.tar.xz spack-e0c7f5ae3d1ba22abe1aac3175f6c5dc777df3a5.zip | |
FAODEL: apply a patch to fix CMake failures on NERSC Cori in faodel@1.1906.1 (#19093)
Co-authored-by: Todd Kordenbrock <thkorde@sandia.gov>
| -rw-r--r-- | var/spack/repos/builtin/packages/faodel/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/faodel/ugni-target-redef-b67e856.patch | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/faodel/package.py b/var/spack/repos/builtin/packages/faodel/package.py index 255f0396fa..8f80576585 100644 --- a/var/spack/repos/builtin/packages/faodel/package.py +++ b/var/spack/repos/builtin/packages/faodel/package.py @@ -56,6 +56,7 @@ class Faodel(CMakePackage): # FAODEL Github issue #5 patch('faodel_sbl.patch', when='@1.1811.1 logging=sbl') patch('lambda-capture-f0267fc.patch', when='@1.1906.1') + patch('ugni-target-redef-b67e856.patch', when='@1.1906.1') def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/faodel/ugni-target-redef-b67e856.patch b/var/spack/repos/builtin/packages/faodel/ugni-target-redef-b67e856.patch new file mode 100644 index 0000000000..5c4524b0d0 --- /dev/null +++ b/var/spack/repos/builtin/packages/faodel/ugni-target-redef-b67e856.patch @@ -0,0 +1,36 @@ +From b67e856309c15f6e2bf5c4187b458f9e08fb1168 Mon Sep 17 00:00:00 2001 +From: Todd Kordenbrock <thkorde@sandia.gov> +Date: Wed, 30 Sep 2020 12:22:23 -0500 +Subject: [PATCH] BUILD: When creating Cray DRC targets, check if the target + already exists. + +--- + cmake/FaodelTPLs.cmake | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/cmake/FaodelTPLs.cmake b/cmake/FaodelTPLs.cmake +index 5f621ec..e3eb10b 100644 +--- a/cmake/FaodelTPLs.cmake ++++ b/cmake/FaodelTPLs.cmake +@@ -306,11 +306,13 @@ elseif( Faodel_NETWORK_LIBRARY STREQUAL "nnti" ) + foreach(drclib ${DRC_PC_LIBRARIES}) + find_library(${drclib}_LIBRARY NAMES ${drclib} HINTS ${DRC_PC_LIBRARY_DIRS}) + if (${drclib}_LIBRARY) +- add_library( ${drclib} IMPORTED UNKNOWN ) +- set_property( TARGET ${drclib} PROPERTY IMPORTED_LOCATION ${${drclib}_LIBRARY} ) +- set_property( TARGET ${drclib} PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${DRC_PC_INCLUDE_DIRS}" ) +- LIST( APPEND DRC_TARGETS ${drclib} ) +- LIST( APPEND DRC_LIBRARIES ${${drclib}_LIBRARY}) ++ if( NOT TARGET ${drclib} ) ++ add_library( ${drclib} IMPORTED UNKNOWN ) ++ set_property( TARGET ${drclib} PROPERTY IMPORTED_LOCATION ${${drclib}_LIBRARY} ) ++ set_property( TARGET ${drclib} PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${DRC_PC_INCLUDE_DIRS}" ) ++ LIST( APPEND DRC_TARGETS ${drclib} ) ++ LIST( APPEND DRC_LIBRARIES ${${drclib}_LIBRARY}) ++ endif ( NOT TARGET ${drclib} ) + endif (${drclib}_LIBRARY) + endforeach(drclib) + LIST(APPEND DRC_INCLUDE_DIRS ${DRC_PC_INCLUDE_DIRS}) +-- +2.20.1 + |