diff --git a/configure.ac b/configure.ac index 4c200b48b5093e407710c5712237276c6bef4d1e..05d8542def749c0823b0a6d050096faf2602dc66 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,7 @@ AS_IF([test "x$enable_shared" == "xyes"], [RING_SHARED=no]) AC_MSG_RESULT([$RING_SHARED]) -DAEMONCPPFLAGS+=" -DASIO_STANDALONE" +DAEMONCPPFLAGS+=" -DASIO_STANDALONE -DMSGPACK_NO_BOOST" dnl dnl Check for the contrib directory diff --git a/contrib/src/msgpack/SHA512SUMS b/contrib/src/msgpack/SHA512SUMS index e4175ad5d613514e42005097ff9d1226e92aad79..82b0f62cf6b780a5396c160f5caf5cc839de885f 100644 --- a/contrib/src/msgpack/SHA512SUMS +++ b/contrib/src/msgpack/SHA512SUMS @@ -1 +1 @@ -33ed87b23d776cadcc230666e6435088e402c5813e7e4dce5ce79c8c3aceba5a36db8f395278042c6ac44c474b33018ff1635889d8b20bc41c5f6f1d1c963cae msgpack-c-cpp-3.3.0.tar.gz \ No newline at end of file +6f2ec74562f30d12ba81659737c412317848eb27fbc607a2f4f8da4b75534fbfba7d280a5af6fdae3581a6a2582e6cf06d7fbfacc3bdee1174456817dd9f7e30 msgpack-c-cpp-6.0.0.tar.gz diff --git a/contrib/src/msgpack/rules.mak b/contrib/src/msgpack/rules.mak index e2aabb421b0b31680060624cac3d5413e8b5d468..079800203b367f8c1fa860e644ba8dde8645ff11 100644 --- a/contrib/src/msgpack/rules.mak +++ b/contrib/src/msgpack/rules.mak @@ -1,5 +1,5 @@ # MSGPACK -MSGPACK_VERSION := cpp-3.3.0 +MSGPACK_VERSION := cpp-6.0.0 MSGPACK_URL := https://github.com/msgpack/msgpack-c/archive/$(MSGPACK_VERSION).tar.gz PKGS += msgpack @@ -9,6 +9,7 @@ endif MSGPACK_CMAKECONF := -DMSGPACK_CXX17=ON \ -DMSGPACK_CXX_ONLY=ON \ + -DMSGPACK_USE_BOOST=Off \ -DMSGPACK_BUILD_EXAMPLES=OFF \ -DMSGPACK_ENABLE_SHARED=OFF \ -DCMAKE_INSTALL_LIBDIR=lib diff --git a/meson.build b/meson.build index dfba0005d90ff233cd67aa7ec2e8dd62acc546f4..6e32690d462f49d67e2b8dcec1d59e387ad83c6a 100644 --- a/meson.build +++ b/meson.build @@ -157,6 +157,7 @@ if get_option('default_library') != 'static' endif add_project_arguments('-DASIO_STANDALONE', language: ['c', 'cpp']) +add_project_arguments('-DMSGPACK_NO_BOOST', language: ['c', 'cpp']) subdir('src')