This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 67171c6b9e [chore](maven) Prefer protoc in thirdparty to the one in
maven artifacts (#17596) (#19524)
67171c6b9e is described below
commit 67171c6b9e88d413120899f0ec102b67516ebf9a
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Thu May 11 10:44:09 2023 +0800
[chore](maven) Prefer protoc in thirdparty to the one in maven artifacts
(#17596) (#19524)
The prebuilt protoc-gen-grpc-java binary uses glibc on Linux and the
version of glibc which Centos 6 uses is too old.
---
fe/fe-core/pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 100f31f199..c4bb07c944 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -61,6 +61,7 @@ under the License.
</properties>
</profile>
<profile>
+ <id>protoc_rosetta</id>
<activation>
<os>
<name>Mac OS X</name>
@@ -72,6 +73,17 @@ under the License.
<grpc.java.artifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:osx-x86_64</grpc.java.artifact>
</properties>
</profile>
+ <profile>
+ <id>protoc_command</id>
+ <activation>
+ <file>
+ <exists>${doris.thirdparty}/installed/bin/protoc</exists>
+ </file>
+ </activation>
+ <properties>
+
<protoc.command>${doris.thirdparty}/installed/bin/protoc</protoc.command>
+ </properties>
+ </profile>
</profiles>
<dependencyManagement>
<dependencies>
@@ -907,7 +919,7 @@ under the License.
<goal>run</goal>
</goals>
<configuration>
- <!--
<protocCommand>${doris.thirdparty}/installed/bin/protoc</protocCommand> -->
+ <protocCommand>${protoc.command}</protocCommand>
<!--You can use following protocArtifact instead
of protocCommand, so that you don't need to install protobuf tools-->
<protocArtifact>${protoc.artifact}</protocArtifact>
<protocVersion>${protobuf.version}</protocVersion>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
