Browse Source

msgpack-c: Update to 4.0.0

- Fixed typo error in PKG_LICENSE_FILES.
- Updated CMAKE_OPTIONS.
- Refreshed the patch.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
lilik-openwrt-22.03
Tianling Shen 3 years ago
committed by Rosen Penev
parent
commit
e4d463b89d
2 changed files with 15 additions and 11 deletions
  1. +11
    -7
      libs/msgpack-c/Makefile
  2. +4
    -4
      libs/msgpack-c/patches/010-no-gtest.patch

+ 11
- 7
libs/msgpack-c/Makefile View File

@ -5,16 +5,16 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=msgpack-c PKG_NAME:=msgpack-c
PKG_VERSION:=3.3.0
PKG_VERSION:=4.0.0
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/cpp-$(PKG_VERSION)?
PKG_HASH:=754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-cpp-$(PKG_VERSION)
PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/c-$(PKG_VERSION)?
PKG_HASH:=656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-c-$(PKG_VERSION)
PKG_LICENSE:=BSL-1.0 PKG_LICENSE:=BSL-1.0
PKG_LICENSE_FILES:=LICENSE
PKG_LICENSE_FILES:=COPYING LICENSE_1_0.txt
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org> PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -23,12 +23,16 @@ CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
CMAKE_OPTIONS+= -DMSGPACK_BUILD_EXAMPLES:BOOL=OFF
CMAKE_OPTIONS+= \
-DBUILD_SHARED_LIBS=ON \
-DMSGPACK_BUILD_EXAMPLES=OFF \
-DMSGPACK_BUILD_TESTS=OFF \
-DMSGPACK_ENABLE_STATIC=OFF
define Package/msgpack-c define Package/msgpack-c
SECTION:=lib SECTION:=lib
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=MessagePack implementation for C and C++
TITLE:=MessagePack implementation for C
URL:=https://github.com/msgpack/msgpack-c URL:=https://github.com/msgpack/msgpack-c
endef endef


+ 4
- 4
libs/msgpack-c/patches/010-no-gtest.patch View File

@ -1,10 +1,10 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -148,7 +148,6 @@ FOREACH (F ${PREPROCESSOR_FILES})
FILE (GENERATE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/${F} CONTENT ${CONTENT})
ENDFOREACH ()
@@ -74,7 +74,6 @@ IF (MSGPACK_CHAR_SIGN)
SET (CMAKE_C_FLAGS "-f${MSGPACK_CHAR_SIGN}-char ${CMAKE_C_FLAGS}")
ENDIF ()
-FIND_PACKAGE (GTest) -FIND_PACKAGE (GTest)
FIND_PACKAGE (ZLIB) FIND_PACKAGE (ZLIB)
FIND_PACKAGE (Threads) FIND_PACKAGE (Threads)
IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND AND NOT "${MSGPACK_FUZZ_REGRESSION}" STREQUAL "ON")
IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND)

Loading…
Cancel
Save