This is an automated email from the ASF dual-hosted git repository. stigahuang pushed a commit to branch branch-3.4.2 in repository https://gitbox.apache.org/repos/asf/impala.git
commit 483dc98305873f014fc7e6c345ede6c065280c73 Author: stiga-huang <[email protected]> AuthorDate: Mon Apr 8 20:36:52 2024 +0800 IMPALA-10262: (Addendum) fix incorrect paths of shared libs in building the package This fixes the wrong paths for adding shared libs to the package due to env var IMPALA_TOOLCHAIN_PACKAGES_HOME doesn't exist in the 3.4.x branch. Change-Id: I6469364a87441acdc7c70a8997bcaa21d720dde7 Reviewed-on: http://gerrit.cloudera.org:8080/21259 Reviewed-by: Zihao Ye <[email protected]> Tested-by: Quanlong Huang <[email protected]> --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6828e5f04..69b5a64f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -423,14 +423,13 @@ install(DIRECTORY "www/" DESTINATION ${IMPALA_INSTALLDIR}/www) install(FILES fe/target/impala-frontend-$ENV{IMPALA_VERSION}.jar DESTINATION ${IMPALA_INSTALLDIR}/jar) -set(IMPALA_GCC_HOME $ENV{IMPALA_TOOLCHAIN_PACKAGES_HOME}/gcc-$ENV{IMPALA_GCC_VERSION}) -FILE(GLOB gcc_lib ${IMPALA_GCC_HOME}/lib64/libgcc_s.so.1*) +FILE(GLOB gcc_lib ${GCC_ROOT}/lib64/libgcc_s.so.1*) install(FILES ${gcc_lib} DESTINATION ${IMPALA_INSTALLDIR}/lib) -FILE(GLOB cpp_lib ${IMPALA_GCC_HOME}/lib64/libstdc++.so.6*) +FILE(GLOB cpp_lib ${GCC_ROOT}/lib64/libstdc++.so.6*) install(FILES ${cpp_lib} DESTINATION ${IMPALA_INSTALLDIR}/lib) -set(KUDU_HOME $ENV{IMPALA_TOOLCHAIN_PACKAGES_HOME}/kudu-$ENV{IMPALA_KUDU_VERSION}/release) +set(KUDU_HOME $ENV{IMPALA_TOOLCHAIN}/kudu-$ENV{IMPALA_KUDU_VERSION}/release) # The parent folder is lib64 on centos/redhat, while on ubuntu it's lib. FILE(GLOB kudu_lib ${KUDU_HOME}/lib*/libkudu_client.so*) install(FILES ${kudu_lib} DESTINATION ${IMPALA_INSTALLDIR}/lib)
