Merge branch 'main' into v2.17.x
authorCarl Hetherington <cth@carlh.net>
Sun, 4 Feb 2024 12:03:45 +0000 (13:03 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 4 Feb 2024 12:03:45 +0000 (13:03 +0100)
1  2 
src/lib/wscript
wscript

diff --cc src/lib/wscript
Simple merge
diff --cc wscript
index f6907f3a20c858c4b4aec1040bf2ca7ae0917483,8313a1f705999e2515a0dd8c876dfe7519f02036..f4e33328f0b2e3c2ec592941b489086d107ebb6b
+++ b/wscript
@@@ -112,9 -110,14 +112,16 @@@ def configure(conf)
                                         '-Wall',
                                         '-Wextra',
                                         '-Wwrite-strings',
-                                        '-Wno-error=deprecated',
 +                                       # getMessengerLogger() in the grok code triggers these warnings
 +                                       '-Wno-nonnull',
+                                        # These next 5 are for Xcode 15.0.1 with the v2.16.x-era
+                                        # dependencies; maybe they aren't necessary when building
+                                        # v2.1{7,8}.x
+                                        '-Wno-error=deprecated',
+                                        '-Wno-deprecated-builtins',
+                                        '-Wno-deprecated-declarations',
+                                        '-Wno-enum-constexpr-conversion',
+                                        '-Wno-deprecated-copy',
                                         # I tried and failed to ignore these with _Pragma
                                         '-Wno-ignored-qualifiers',
                                         '-D_FILE_OFFSET_BITS=64',