diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-20 21:41:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-21 07:36:00 +0200 |
| commit | fd71427f6502f4540053c10d8eb9b495451d959d (patch) | |
| tree | 779c9064c5ce355e50728b9f5b78e97109d9d5be /external | |
| parent | f0fcbcadac148a5bfd36b2a26795d45aef8eace4 (diff) | |
external/mysql-connector-cpp uses std::auto_ptr, must not be compiled as C++17
But gb_CXX03FLAGS may contain -Werror=c++11-extensions and would thus fail with
> [CXX] workdir/UnpackedTarball/mysql-connector-cpp/driver/mysql_connection.cpp
> In file included from workdir/UnpackedTarball/mysql-connector-cpp/driver/mysql_connection.cpp:44:
> In file included from workdir/UnpackedTarball/mysql-connector-cpp/driver/mysql_util.h:30:
> In file included from workdir/UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_private_iface.h:63:
> workdir/UnpackedTarball/mariadb-connector-c/include/mysql.h:223:45: error: commas at the end of enumerator lists are a C++11 extension [-Werror,-Wc++11-extensions]
> MYSQL_STATUS_QUIT_SENT, /* object is "destroyed" at this stage */
> ^
(And otherwise the code appears to build fine with gb_CXX03FLAGS, so just stick
with that instead of coming up with yet another way of compiling as >= C++11 and
< C++17.)
Change-Id: I924d906e34c073672f2038072743197d3f7fef5f
Reviewed-on: https://gerrit.libreoffice.org/59368
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/mysql-connector-cpp/Library_mysqlcppconn.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk b/external/mysql-connector-cpp/Library_mysqlcppconn.mk index 152aee8c0764..8efe63be8b05 100644 --- a/external/mysql-connector-cpp/Library_mysqlcppconn.mk +++ b/external/mysql-connector-cpp/Library_mysqlcppconn.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_use_externals,mysqlcppconn,\ endif endif +$(eval $(call gb_Library_add_cxxflags,mysqlcppconn,$(filter-out -Werror=%,$(gb_CXX03FLAGS)))) + $(eval $(call gb_Library_set_external_code,mysqlcppconn)) $(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn)) |