From 73c1fefa903cee8a66e098475ef39cf38153a400 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 26 Dec 2016 17:08:32 -0800 Subject: [PATCH 1/2] Revert "protobuf: set protoc path" This reverts commit 38b34f98fe9e46f753dbb6f932886bc89f491f7f. --- packages/addons/addon-depends/protobuf/package.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/addons/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk index d62824a8d7..58928b58d1 100644 --- a/packages/addons/addon-depends/protobuf/package.mk +++ b/packages/addons/addon-depends/protobuf/package.mk @@ -39,8 +39,6 @@ PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \ PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_HOST" -PKG_CONFIGURE_OPTS_TARGET="--with-protoc=$ROOT/$TOOLCHAIN/bin/protoc" - post_makeinstall_target() { rm -rf $INSTALL/usr/bin From 9f9f171fa7739965dc3c66e6dacdfb9dba95e835 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 26 Dec 2016 17:07:59 -0800 Subject: [PATCH 2/2] protobuf: fix path to CMakeLists.txt --- packages/addons/addon-depends/protobuf/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk index 58928b58d1..92a97cea7f 100644 --- a/packages/addons/addon-depends/protobuf/package.mk +++ b/packages/addons/addon-depends/protobuf/package.mk @@ -29,7 +29,7 @@ PKG_LONGDESC="protobuf: Protocol Buffers - Google's data interchange format" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CMAKE_SCRIPT="cmake/CMakeLists.txt" +PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/cmake/CMakeLists.txt" PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \ -DBUILD_SHARED_LIBS=0 \