You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ad...@apache.org on 2023/04/14 04:24:03 UTC

[doris] branch branch-1.2-lts updated: [chore](third-party) Configure the search paths for pkg-config and cmake (#18624) (#18661)

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 3632c4e27a [chore](third-party) Configure the search paths for pkg-config and cmake (#18624) (#18661)
3632c4e27a is described below

commit 3632c4e27a567836915a4fc5fd76685520f76f9a
Author: Adonis Ling <ad...@gmail.com>
AuthorDate: Fri Apr 14 12:23:56 2023 +0800

    [chore](third-party) Configure the search paths for pkg-config and cmake (#18624) (#18661)
    
    Currently, our third party libraries are built by autotools or cmake. Under some scenarios, we may use system-wide headers or libraries to build them which may make the build process fail.
    
    We can configure the search paths explicitly to help autotools and cmake find the right dependencies.
---
 thirdparty/build-thirdparty.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 1e238e8764..0128449d73 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -171,6 +171,13 @@ pushd "${TP_DIR}/installed"/
 ln -sf lib64 lib
 popd
 
+# Configure the search paths for pkg-config and cmake
+export PKG_CONFIG_PATH="${TP_DIR}/installed/lib64/pkgconfig"
+export CMAKE_PREFIX_PATH="${TP_DIR}/installed"
+
+echo "PKG_CONFIG_PATH: ${PKG_CONFIG_PATH}"
+echo "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}"
+
 check_prerequest() {
     local CMD="$1"
     local NAME="$2"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org