From e8da6d929451acbdcd94ae1fc747c876a84df8bc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 21 Sep 2019 13:24:13 -0700 Subject: [PATCH] protobuf: Fix host build rpath is needed as the host directory instead of hostpkg is used for some reason. Signed-off-by: Rosen Penev --- libs/protobuf/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index fb2d84fdd..a4310b4f5 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:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) @@ -68,7 +68,10 @@ endef CMAKE_HOST_OPTIONS += \ -Dprotobuf_BUILD_PROTOC_BINARIES=ON \ - -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_BUILD_TESTS=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" CMAKE_OPTIONS += \ -Dprotobuf_BUILD_PROTOC_BINARIES=ON \