diff --git a/config/lib.json b/config/lib.json index 1c4525d8..13f886ca 100644 --- a/config/lib.json +++ b/config/lib.json @@ -186,9 +186,6 @@ }, "grpc": { "source": "grpc", - "static-libs-unix": [ - "libgrpc.a" - ], "pkg-configs": [ "grpc" ], diff --git a/src/SPC/builder/extension/grpc.php b/src/SPC/builder/extension/grpc.php index 7e384355..6ddfb008 100644 --- a/src/SPC/builder/extension/grpc.php +++ b/src/SPC/builder/extension/grpc.php @@ -41,7 +41,7 @@ class grpc extends Extension public function patchBeforeConfigure(): bool { - $util = new SPCConfigUtil($this->builder); + $util = new SPCConfigUtil($this->builder, ['libs_only_deps' => true]); $config = $util->config(['grpc']); $libs = $config['libs']; FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lgrpc', $libs); diff --git a/src/SPC/builder/unix/library/grpc.php b/src/SPC/builder/unix/library/grpc.php index 0148c969..6e40c7f6 100644 --- a/src/SPC/builder/unix/library/grpc.php +++ b/src/SPC/builder/unix/library/grpc.php @@ -50,6 +50,7 @@ trait grpc $cmake->build(); copy($this->source_dir . '/third_party/re2/re2.pc', BUILD_LIB_PATH . '/pkgconfig/re2.pc'); + $this->patchPkgconfPrefix(['grpc++.pc', 'grpc.pc', 'grpc++_unsecure.pc', 'grpc_unsecure.pc', 're2.pc']); // shell()->cd($this->source_dir) // ->exec('EXTRA_DEFINES=GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK EMBED_OPENSSL=false CXXFLAGS="-L' . BUILD_LIB_PATH . ' -I' . BUILD_INCLUDE_PATH . '" make static -j' . $this->builder->concurrency);