protobuf: Fix rpath
protobuf was setting its own rpath, preventing the build system from overriding it. Comment it out. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
7a2b6bfdb8
commit
a6529c2ac2
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=protobuf
|
||||
PKG_VERSION:=3.8.0
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
--- a/cmake/install.cmake
|
||||
+++ b/cmake/install.cmake
|
||||
@@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries})
|
||||
$<BUILD_INTERFACE:${protobuf_source_dir}/src>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
||||
if (UNIX AND NOT APPLE)
|
||||
- set_property(TARGET ${_library}
|
||||
- PROPERTY INSTALL_RPATH "$ORIGIN")
|
||||
+# set_property(TARGET ${_library}
|
||||
+# PROPERTY INSTALL_RPATH "$ORIGIN")
|
||||
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)
|
||||
if (UNIX AND NOT APPLE)
|
||||
- set_property(TARGET protoc
|
||||
- PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
|
||||
+# set_property(TARGET protoc
|
||||
+# PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
|
||||
elseif (APPLE)
|
||||
set_property(TARGET protoc
|
||||
PROPERTY INSTALL_RPATH "@loader_path/../lib")
|
Loading…
Reference in New Issue