From: Mark Kogan <mkogan@redhat.com>
Date: Tue, 4 Feb 2020 10:30:55 +0000 (+0200)
Subject: common: fix clang compile errors from cython_modules
X-Git-Tag: v15.1.1~533^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33056%2Fhead;p=ceph.git

common: fix clang compile errors from cython_modules

Signed-off-by: Mark Kogan <mkogan@redhat.com>
---

diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
index 3ba67a272c7f..5edaaaae89df 100755
--- a/src/pybind/cephfs/setup.py
+++ b/src/pybind/cephfs/setup.py
@@ -19,7 +19,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     else:
         return flags
 
@@ -55,7 +58,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))
 
diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
index 1a7db0091f16..771a455eed2e 100755
--- a/src/pybind/rados/setup.py
+++ b/src/pybind/rados/setup.py
@@ -27,7 +27,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     else:
         return flags
 
@@ -55,7 +58,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))
 
diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
index f48432f0cd48..7f3983d6bfef 100755
--- a/src/pybind/rbd/setup.py
+++ b/src/pybind/rbd/setup.py
@@ -19,7 +19,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     else:
         return flags
 
@@ -55,7 +58,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))
 
diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
index ab9f3a88e90a..ce77605c7db4 100755
--- a/src/pybind/rgw/setup.py
+++ b/src/pybind/rgw/setup.py
@@ -19,7 +19,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     return flags
 
 def monkey_with_compiler(compiler):
@@ -58,7 +61,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))