Merge pull request #13834 from br101/protobuf-3.13.0
protobuf: Update to version 3.13.0
This commit is contained in:
commit
b383f4af28
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=protobuf
|
PKG_NAME:=protobuf
|
||||||
PKG_VERSION:=3.8.0
|
PKG_VERSION:=3.13.0
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
|
||||||
PKG_HASH:=ddc96d83f3b7417da53bce2510b94ad2796465ef8763f7a4e82089157efe97aa
|
PKG_HASH:=f8a547dfe143a9f61fadafba47fa6573713a33cb80909307c1502e26e1102298
|
||||||
|
|
||||||
PKG_MAINTAINER:=Ken Keys <kkeys@caida.org>
|
PKG_MAINTAINER:=Ken Keys <kkeys@caida.org>
|
||||||
PKG_LICENSE:=BSD-3-Clause
|
PKG_LICENSE:=BSD-3-Clause
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
--- a/cmake/install.cmake
|
Index: protobuf-3.13.0/cmake/install.cmake
|
||||||
+++ b/cmake/install.cmake
|
===================================================================
|
||||||
|
--- protobuf-3.13.0.orig/cmake/install.cmake
|
||||||
|
+++ protobuf-3.13.0/cmake/install.cmake
|
||||||
@@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries})
|
@@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries})
|
||||||
$<BUILD_INTERFACE:${protobuf_source_dir}/src>
|
$<BUILD_INTERFACE:${protobuf_source_dir}/src>
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
||||||
if (UNIX AND NOT APPLE)
|
if (UNIX AND NOT APPLE)
|
||||||
- set_property(TARGET ${_library}
|
- set_property(TARGET ${_library}
|
||||||
- PROPERTY INSTALL_RPATH "$ORIGIN")
|
- PROPERTY INSTALL_RPATH "$ORIGIN")
|
||||||
+# set_property(TARGET ${_library}
|
+# set_property(TARGET ${_library}
|
||||||
+# PROPERTY INSTALL_RPATH "$ORIGIN")
|
+# PROPERTY INSTALL_RPATH "$ORIGIN")
|
||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
set_property(TARGET ${_library}
|
set_property(TARGET ${_library}
|
||||||
|
@ -16,9 +18,9 @@
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
|
||||||
if (UNIX AND NOT APPLE)
|
if (UNIX AND NOT APPLE)
|
||||||
- set_property(TARGET protoc
|
- set_property(TARGET protoc
|
||||||
- PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
|
- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
|
||||||
+# set_property(TARGET protoc
|
+# set_property(TARGET protoc
|
||||||
+# PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
|
+# PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
|
||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
set_property(TARGET protoc
|
set_property(TARGET protoc
|
||||||
PROPERTY INSTALL_RPATH "@loader_path/../lib")
|
PROPERTY INSTALL_RPATH "@loader_path/../lib")
|
||||||
|
|
Loading…
Reference in New Issue