From dc2eeb3741fb3435707b1dc8a78a3e88d8836314 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 24 Nov 2017 17:47:59 +0200
Subject: Various tweaks

---
 build/root.build | 4 ++--
 mysql/buildfile  | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/root.build b/build/root.build
index b699441..79a2c0e 100644
--- a/build/root.build
+++ b/build/root.build
@@ -12,11 +12,11 @@ c{*}: extension = c
 # The upstream package uses -std=gnu++03 on Linux. However we can't specify
 # C++03 as the code refers to the strtoull() C function that was introduced
 # in C++11. Specifying C++11 looks like an overkill, and can break something
-# else.
+# else. And Clang doesn't recognize gnu++03, only gnu++98.
 #
 using cxx.guess
 
-cxx.std = ($cxx.id == 'gcc' || $cxx.id == 'clang' ? gnu++03 : 03)
+cxx.std = ($cxx.id == 'gcc' || $cxx.id == 'clang' ? gnu++98 : 03)
 
 using cxx
 
diff --git a/mysql/buildfile b/mysql/buildfile
index cbb41bf..a286bc6 100644
--- a/mysql/buildfile
+++ b/mysql/buildfile
@@ -201,11 +201,12 @@ else
   #
   cc.coptions += -fno-omit-frame-pointer -fno-strict-aliasing
 
-  # Disable warnings that pop up with -W -Wall.
+  # Disable warnings that pop up with -Wall -Wextra. Upstream doesn't seem to
+  # care about these and it is not easy to disable specific warnings in a way
+  # that works across compilers/version (some -Wno-* options are only
+  # recognized in newer versions).
   #
-  cc.coptions += -Wno-unused-parameter -Wno-unused-variable              \
-                 -Wno-unused-const-variable -Wno-unused-but-set-variable \
-                 -Wno-maybe-uninitialized
+  cc.coptions += -Wno-all -Wno-extra
 }
 
 if ($tclass != 'windows')
-- 
cgit v1.1