From: Kefu Chai <kchai@redhat.com>
Date: Mon, 10 Feb 2020 13:41:10 +0000 (+0800)
Subject: pybind: convert filterfalse to list before returning
X-Git-Tag: v15.1.1~476^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c35ac57e2787d28772df3f4b8b10c7d71eed8637;p=ceph.git

pybind: convert filterfalse to list before returning

distutils expects a list not an iterator

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
index 338b25b190db..84767b460ac9 100755
--- a/src/pybind/cephfs/setup.py
+++ b/src/pybind/cephfs/setup.py
@@ -15,14 +15,14 @@ import distutils.sysconfig
 
 def filter_unsupported_flags(compiler, flags):
     if 'clang' in compiler:
-        return filterfalse(lambda f:
-                           f in ('-mcet',
-                                 '-fstack-clash-protection',
-                                 '-fno-var-tracking-assignments',
-                                 '-Wno-deprecated-register',
-                                 '-Wno-gnu-designator') or
-                           f.startswith('-fcf-protection'),
-                           flags)
+        return list(filterfalse(lambda f:
+                                f in ('-mcet',
+                                      '-fstack-clash-protection',
+                                      '-fno-var-tracking-assignments',
+                                      '-Wno-deprecated-register',
+                                      '-Wno-gnu-designator') or
+                                f.startswith('-fcf-protection'),
+                                flags))
     else:
         return flags
 
diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
index afe19003ba4a..fe51bcd4e0d9 100755
--- a/src/pybind/rados/setup.py
+++ b/src/pybind/rados/setup.py
@@ -15,14 +15,14 @@ import textwrap
 
 def filter_unsupported_flags(compiler, flags):
     if 'clang' in compiler:
-        return filterfalse(lambda f:
-                           f in ('-mcet',
-                                 '-fstack-clash-protection',
-                                 '-fno-var-tracking-assignments',
-                                 '-Wno-deprecated-register',
-                                 '-Wno-gnu-designator') or
-                           f.startswith('-fcf-protection'),
-                           flags)
+        return list(filterfalse(lambda f:
+                                f in ('-mcet',
+                                      '-fstack-clash-protection',
+                                      '-fno-var-tracking-assignments',
+                                      '-Wno-deprecated-register',
+                                      '-Wno-gnu-designator') or
+                                f.startswith('-fcf-protection'),
+                                flags))
     else:
         return flags
 
diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
index 5ce6784f6281..b1f849874149 100755
--- a/src/pybind/rbd/setup.py
+++ b/src/pybind/rbd/setup.py
@@ -15,14 +15,14 @@ import distutils.sysconfig
 
 def filter_unsupported_flags(compiler, flags):
     if 'clang' in compiler:
-        return filterfalse(lambda f:
-                           f in ('-mcet',
-                                 '-fstack-clash-protection',
-                                 '-fno-var-tracking-assignments',
-                                 '-Wno-deprecated-register',
-                                 '-Wno-gnu-designator') or
-                           f.startswith('-fcf-protection'),
-                           flags)
+        return list(filterfalse(lambda f:
+                                f in ('-mcet',
+                                      '-fstack-clash-protection',
+                                      '-fno-var-tracking-assignments',
+                                      '-Wno-deprecated-register',
+                                      '-Wno-gnu-designator') or
+                                f.startswith('-fcf-protection'),
+                                flags))
     else:
         return flags
 
diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
index e748857d9483..cb5024820b5f 100755
--- a/src/pybind/rgw/setup.py
+++ b/src/pybind/rgw/setup.py
@@ -15,14 +15,14 @@ import distutils.sysconfig
 
 def filter_unsupported_flags(compiler, flags):
     if 'clang' in compiler:
-        return filterfalse(lambda f:
-                           f in ('-mcet',
-                                 '-fstack-clash-protection',
-                                 '-fno-var-tracking-assignments',
-                                 '-Wno-deprecated-register',
-                                 '-Wno-gnu-designator') or
-                           f.startswith('-fcf-protection'),
-                           flags)
+        return list(filterfalse(lambda f:
+                                f in ('-mcet',
+                                      '-fstack-clash-protection',
+                                      '-fno-var-tracking-assignments',
+                                      '-Wno-deprecated-register',
+                                      '-Wno-gnu-designator') or
+                                f.startswith('-fcf-protection'),
+                                flags))
     else:
         return flags