contrib: update msgpack-cxx to 6.0.0

Change-Id: I94da5dedff8f29e38f7aa517cf2212f5142d8f29
savoirfairelinux · Apr 26, 2023 · 32415a8 · 32415a8
1 parent 11aafbb
commit 32415a8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -1 +1 @@
-33ed87b23d776cadcc230666e6435088e402c5813e7e4dce5ce79c8c3aceba5a36db8f395278042c6ac44c474b33018ff1635889d8b20bc41c5f6f1d1c963cae  msgpack-c-cpp-3.3.0.tar.gz
+6f2ec74562f30d12ba81659737c412317848eb27fbc607a2f4f8da4b75534fbfba7d280a5af6fdae3581a6a2582e6cf06d7fbfacc3bdee1174456817dd9f7e30  msgpack-c-cpp-6.0.0.tar.gz
diff --git 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
@@ -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')
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		33ed87b23d776cadcc230666e6435088e402c5813e7e4dce5ce79c8c3aceba5a36db8f395278042c6ac44c474b33018ff1635889d8b20bc41c5f6f1d1c963cae msgpack-c-cpp-3.3.0.tar.gz
		6f2ec74562f30d12ba81659737c412317848eb27fbc607a2f4f8da4b75534fbfba7d280a5af6fdae3581a6a2582e6cf06d7fbfacc3bdee1174456817dd9f7e30 msgpack-c-cpp-6.0.0.tar.gz
-Original file line number
+Diff line change
@@ Expand Up / @@ -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')
@@ Expand Down @@