diff --git a/[refs] b/[refs] index d3ffb2bc28f..f34ab8c1816 100644 --- a/[refs] +++ b/[refs] @@ -1,5 +1,5 @@ --- -refs/heads/master: 621bdc1993d2e8da08b9b240043dc13481cd644f +refs/heads/master: 736eae4899fb15d5430c75f49f7a18e7de68f7ea refs/heads/daisy: d3d14d3fcca7fcde362cf0b31411dc4eea6d20aa refs/heads/danny-next: aba52d3f2fd55cbfa1a9ec40fdd9281e88e943e7 refs/heads/danny: f00028caf257e386c0f3ae46bd4b3ba53dd0729d diff --git a/trunk/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb b/trunk/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb index ac8aba382ee..b4f10662dc9 100644 --- a/trunk/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb +++ b/trunk/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb @@ -34,12 +34,11 @@ EXTRA_OECMAKE = " \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_INSTALL=ON \ -DCMAKE_CROSSCOMPILING=ON \ - -DBUILD_SHARED_LIBS=ON \ -DgRPC_INSTALL_LIBDIR=${baselib} \ -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ " -PACKAGECONFIG ??= "cpp" +PACKAGECONFIG ??= "cpp shared" PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" @@ -48,6 +47,7 @@ PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUG PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," do_configure:prepend() { sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt