From 32415a83275b5b74223080fa61a0cd58570fb46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 20 Apr 2023 11:19:58 -0400
Subject: [PATCH] contrib: update msgpack-cxx to 6.0.0
Change-Id: I94da5dedff8f29e38f7aa517cf2212f5142d8f29
---
configure.ac | 2 +-
contrib/src/msgpack/SHA512SUMS | 2 +-
contrib/src/msgpack/rules.mak | 3 ++-
meson.build | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4c200b48b5..05d8542def 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 e4175ad5d6..82b0f62cf6 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 e2aabb421b..079800203b 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 dfba0005d9..6e32690d46 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')
--
GitLab