diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2020-06-03 11:38:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 11:38:27 -0700 |
| commit | 0086c475466ee2501ccbf446a22ed68930c3e580 (patch) | |
| tree | 5a023dc074d7c070652ef5167f435da77154d0ca | |
| parent | 3347ef2de4e08374750eb68f750800c1854d595f (diff) | |
| download | spack-0086c475466ee2501ccbf446a22ed68930c3e580.tar.gz spack-0086c475466ee2501ccbf446a22ed68930c3e580.tar.bz2 spack-0086c475466ee2501ccbf446a22ed68930c3e580.tar.xz spack-0086c475466ee2501ccbf446a22ed68930c3e580.zip | |
patch lambda capture issue for @1.1906.1, fixed in upstream faodel@master (#16935)
| -rw-r--r-- | var/spack/repos/builtin/packages/faodel/lambda-capture-f0267fc.patch | 26 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/faodel/package.py | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/faodel/lambda-capture-f0267fc.patch b/var/spack/repos/builtin/packages/faodel/lambda-capture-f0267fc.patch new file mode 100644 index 0000000000..2dd2c32d11 --- /dev/null +++ b/var/spack/repos/builtin/packages/faodel/lambda-capture-f0267fc.patch @@ -0,0 +1,26 @@ +From f0267fc728d0f49ad396b83e8e62fba54027f31f Mon Sep 17 00:00:00 2001 +From: Craig Ulmer <craig@craigulmer.com> +Date: Fri, 29 May 2020 23:08:29 -0700 +Subject: [PATCH] FIX: Removes variable from lambda capture that conflicted + with args + +--- + src/kelpie/pools/DHTPool/DHTPool.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kelpie/pools/DHTPool/DHTPool.cpp b/src/kelpie/pools/DHTPool/DHTPool.cpp +index df9c1d3..d24aa89 100644 +--- a/src/kelpie/pools/DHTPool/DHTPool.cpp ++++ b/src/kelpie/pools/DHTPool/DHTPool.cpp +@@ -229,7 +229,7 @@ rc_t DHTPool::Need(const Key &key, size_t expected_ldo_user_bytes, lunasa::DataO + bool is_found=false; + + rc_t rc = Want(key, expected_ldo_user_bytes, +- [&key, &returned_ldo, &cv, &is_found] (bool success, Key key, lunasa::DataObject result_ldo, ++ [&returned_ldo, &cv, &is_found] (bool success, Key key, lunasa::DataObject result_ldo, + const kv_row_info_t &ri, const kv_col_info_t &c) { + if(success) { + *returned_ldo = result_ldo; +-- +2.24.2 (Apple Git-127) + diff --git a/var/spack/repos/builtin/packages/faodel/package.py b/var/spack/repos/builtin/packages/faodel/package.py index 63f5798a02..255f0396fa 100644 --- a/var/spack/repos/builtin/packages/faodel/package.py +++ b/var/spack/repos/builtin/packages/faodel/package.py @@ -55,6 +55,7 @@ class Faodel(CMakePackage): patch('faodel_mpi.patch', when='@1.1811.1 ~mpi') # FAODEL Github issue #5 patch('faodel_sbl.patch', when='@1.1811.1 logging=sbl') + patch('lambda-capture-f0267fc.patch', when='@1.1906.1') def cmake_args(self): spec = self.spec |