Browse Source

Merge pull request #15849 from neheb/ppb

protobuf: update to 3.17.2
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
8cbbadede7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
  1. +2
    -2
      libs/protobuf/Makefile
  2. +3
    -3
      libs/protobuf/patches/010-rpath.patch

+ 2
- 2
libs/protobuf/Makefile View File

@ -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


+ 3
- 3
libs/protobuf/patches/010-rpath.patch View File

@ -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}")


Loading…
Cancel
Save