openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 01:44:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

protobuf: don't use shared libraries for host

Browse Source 
Avoids needing to handle rpath.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit d24229e441)
This commit is contained in:
Rosen Penev
2024-04-07 20:48:32 -07:00
committed by Josef Schlehofer
parent 3fcb698a6c
commit 02f00ef91b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/protobuf/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=protobuf PKG_NAME:=protobuf
PKG_VERSION:=3.17.3 PKG_VERSION:=3.17.3
PKG_RELEASE:=1 PKG_RELEASE:=2
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)
@@ -67,10 +67,8 @@ endef
CMAKE_HOST_OPTIONS += \ CMAKE_HOST_OPTIONS += \
-Dprotobuf_BUILD_PROTOC_BINARIES=ON \ -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
-Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_BUILD_TESTS=OFF \
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-Dprotobuf_BUILD_PROTOC_BINARIES=ON \ -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
@@ -78,7 +76,7 @@ CMAKE_OPTIONS += \
-Dprotobuf_WITH_ZLIB=ON \ -Dprotobuf_WITH_ZLIB=ON \
-DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON
TARGET_LDFLAGS += -latomic $(if $(CONFIG_USE_GLIBC),-lm) TARGET_LDFLAGS += -latomic
define Build/InstallDev define Build/InstallDev
$(call Build/InstallDev/cmake,$(1)) $(call Build/InstallDev/cmake,$(1))