|
| 1 | +Use the pre-ratification spelling "c++2a" of the C++20 standard so that |
| 2 | +meson 0.56.2 on Debian 11 accepts the cpp_std value ("c++20" was only |
| 3 | +added to meson's cpp_std choices in 0.57). gcc and clang treat -std=c++2a |
| 4 | +and -std=c++20 identically, and g++ 10 on bullseye compiles the C++ KMIP |
| 5 | +client fine. The libkmip cmake subproject needs no change: cmake itself |
| 6 | +emits -std=c++2a for CMAKE_CXX_STANDARD 20 on gcc 10. |
| 7 | +--- a/meson.build |
| 8 | ++++ b/meson.build |
| 9 | +@@ -139,7 +139,7 @@ shared_module('pg_tde', |
| 10 | + 'src/pg_tde_guc.c', |
| 11 | + 'src/smgr/pg_tde_smgr.c', |
| 12 | + ), |
| 13 | +- override_options: ['cpp_std=c++20'], |
| 14 | ++ override_options: ['cpp_std=c++2a'], |
| 15 | + include_directories: incdirs, |
| 16 | + install: true, |
| 17 | + install_dir: pkglibdir, |
| 18 | +@@ -168,7 +168,7 @@ pg_tde_frontend = static_library('pg_tde_frontend', |
| 19 | + ), |
| 20 | + c_args: ['-DFRONTEND'], |
| 21 | + cpp_args: ['-DFRONTEND'], |
| 22 | +- override_options: ['cpp_std=c++20'], |
| 23 | ++ override_options: ['cpp_std=c++2a'], |
| 24 | + dependencies: [pgfeutils, pgcommon, pgport, curl, crypto, ssl, kmipclient, kmipcore], |
| 25 | + include_directories: incdirs, |
| 26 | + ) |
0 commit comments