From a6529c2ac2a8df2ea92472c6d8357da5f8f9c60b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 25 Sep 2019 21:59:02 -0700 Subject: [PATCH] protobuf: Fix rpath protobuf was setting its own rpath, preventing the build system from overriding it. Comment it out. Signed-off-by: Rosen Penev --- libs/protobuf/Makefile | 2 +- libs/protobuf/patches/010-rpath.patch | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 libs/protobuf/patches/010-rpath.patch diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index 96d8750b6..251bdffa1 100644 --- a/libs/protobuf/Makefile +++ b/libs/protobuf/Makefile @@ -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) diff --git a/libs/protobuf/patches/010-rpath.patch b/libs/protobuf/patches/010-rpath.patch new file mode 100644 index 000000000..70d27529a --- /dev/null +++ b/libs/protobuf/patches/010-rpath.patch @@ -0,0 +1,24 @@ +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries}) + $ + $) + 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")