]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common: fix clang compile errors from cython_modules 33056/head
authorMark Kogan <mkogan@redhat.com>
Tue, 4 Feb 2020 10:30:55 +0000 (12:30 +0200)
committerMark Kogan <mkogan@redhat.com>
Tue, 4 Feb 2020 12:32:05 +0000 (14:32 +0200)
Signed-off-by: Mark Kogan <mkogan@redhat.com>
src/pybind/cephfs/setup.py
src/pybind/rados/setup.py
src/pybind/rbd/setup.py
src/pybind/rgw/setup.py

index 3ba67a272c7f20a8e05b0dba01031ef514f01715..5edaaaae89df8d3a7616682e1b6dc2e8d436c198 100755 (executable)
@@ -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()))
 
index 1a7db0091f16b8feb28d261f3ee5fc987ba4755a..771a455eed2eeb06ff5b423c8765e220c9b09a47 100755 (executable)
@@ -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()))
 
index f48432f0cd48260d1cd018644bcd929a69b16ff0..7f3983d6bfef98e399718f262e4fa4d3fdb65d3f 100755 (executable)
@@ -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()))
 
index ab9f3a88e90a346ff823f5bbdf81f4392c1a7cfa..ce77605c7db4f1f95d695fdf7072e9acb5a10306 100755 (executable)
@@ -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()))