[bigtop] branch branch-3.2 updated: BIGTOP-3894: Failed to build Alluxio on ppcle64 centos

[gu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

guyuqi pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new aba698a03 BIGTOP-3894: Failed to build Alluxio on ppcle64 centos
aba698a03 is described below

commit aba698a03fda3eb581d1e7e1dedf15b82bc66ee1
Author: Yuqi Gu <gu...@apache.org>
AuthorDate: Thu Dec 22 18:53:21 2022 +0800

    BIGTOP-3894: Failed to build Alluxio on ppcle64 centos
    
    (cherry picked from commit c7c2e1edcd0d890b890fa2a1ca561d8ffdc43c6b)
---
 bigtop-packages/src/common/alluxio/do-component-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigtop-packages/src/common/alluxio/do-component-build b/bigtop-packages/src/common/alluxio/do-component-build
index 111b7fe71..f252ac057 100644
--- a/bigtop-packages/src/common/alluxio/do-component-build
+++ b/bigtop-packages/src/common/alluxio/do-component-build
@@ -26,7 +26,6 @@ if [ $HOSTTYPE = "powerpc64le" ] ; then
   # BIGTOP-3894
   # protobuf-3.19.2/3.17.3 doesn't offically support ppc64le;
   # Skip protoc backwards compatibility check here.
-  sed -i 's/3.19.2/3.17.3/g' pom.xml
   sed -i -e :a -e '$!N;s/.*\n\(.*salesforce\)/\1/;ta' -e 'P;D' pom.xml
   sed -i '/com.salesforce.servicelibs/,+3d' pom.xml
   sed -i '/Proto lock for preventing/,+14d' core/transport/pom.xml
@@ -35,6 +34,7 @@ if [ $HOSTTYPE = "powerpc64le" ] ; then
   # And protoc grpc-java-1.28.0 was also built based on protobuf-3.17.3 in Bigtop toolchain.
   # So manually install 3.17.3 here to workaound the GLIBC issue on Centos-7.
   if [ "${OS}" = "centos" ]; then
+    sed -i 's/3.19.2/3.17.3/g' pom.xml
     mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.17.3 \
       -Dclassifier=linux-ppcle_64 -Dpackaging=exe -Dfile=/usr/local/protobuf-3.17.3/bin/protoc "$@"
   fi