protobuf: don't use shared libraries for host

[feed/packages.git] / libs / protobuf / Makefile

diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile
index 59ac2b709b64af6a9490be2b8aa3273e61b41755..7e60e84986c0d7c6f7b9d17982df9b5153e381d1 100644 (file)
--- a/libs/protobuf/Makefile
+++ b/libs/protobuf/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=protobuf
-PKG_VERSION:=3.15.6
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=3.17.3
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
-PKG_HASH:=bbdfb7455431d7d58666e8a2996d14b236718ff238eecde10646581e4c87f168
+PKG_HASH:=51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb
 
 PKG_MAINTAINER:=Ken Keys <kkeys@caida.org>
 PKG_LICENSE:=BSD-3-Clause
@@ -24,7 +24,7 @@ CMAKE_SOURCE_SUBDIR:=cmake
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
-include ../../devel/ninja/ninja-cmake.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/protobuf/Default
   SECTION:=libs
@@ -67,10 +67,8 @@ endef
 CMAKE_HOST_OPTIONS += \
        -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
        -Dprotobuf_BUILD_TESTS=OFF \
-       -DBUILD_SHARED_LIBS=ON \
-       -DCMAKE_SKIP_RPATH=OFF \
-       -DCMAKE_INSTALL_LIBDIR=lib \
-       -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
+       -DBUILD_SHARED_LIBS=OFF \
+       -DCMAKE_INSTALL_LIBDIR=lib
 
 CMAKE_OPTIONS += \
        -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
@@ -78,7 +76,7 @@ CMAKE_OPTIONS += \
        -Dprotobuf_WITH_ZLIB=ON \
        -DBUILD_SHARED_LIBS=ON
 
-TARGET_LDFLAGS += -latomic $(if $(CONFIG_USE_GLIBC),-lm)
+TARGET_LDFLAGS += -latomic
 
 define Build/InstallDev
        $(call Build/InstallDev/cmake,$(1))