protobuf: update to 3.17.2

Refreshed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile
index 47a109775b561704e2bdcdf6432085d3ee4fddad..f9f1747c00908c4466d682f6533631c407d91765 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_VERSION:=3.17.2
 PKG_RELEASE:=$(AUTORELEASE)
 
 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:=13c5e07a8e2d6847794ac3f23947d9641cab7ded0c50854aad624d48f2821e60
 
 PKG_MAINTAINER:=Ken Keys <kkeys@caida.org>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/libs/protobuf/patches/010-rpath.patch b/libs/protobuf/patches/010-rpath.patch
index b18864bf32fc158594c5b535fa49197ebba50d00..ef3e98ab17e88bfccc8f7ade62e225aea77cf2a5 100644 (file)
--- a/libs/protobuf/patches/010-rpath.patch
+++ b/libs/protobuf/patches/010-rpath.patch
@@ -11,9 +11,9 @@
    elseif (APPLE)
      set_property(TARGET ${_library}
        PROPERTY INSTALL_RPATH "@loader_path")
-@@ -32,8 +32,8 @@ if (protobuf_BUILD_PROTOC_BINARIES)
-   install(TARGETS protoc EXPORT protobuf-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
+@@ -34,8 +34,8 @@ if (protobuf_BUILD_PROTOC_BINARIES)
+     BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+     COMPONENT protoc)
    if (UNIX AND NOT APPLE)
 -    set_property(TARGET protoc
 -      PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")