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

[ad...@apache.org]

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

adonisling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new d28030e1e5 [chore](third-party) Configure the search paths for pkg-config and cmake (#18624)
d28030e1e5 is described below

commit d28030e1e5046b24895a8a0dbee2acbe71b0cfc7
Author: Adonis Ling <ad...@gmail.com>
AuthorDate: Fri Apr 14 08:43:27 2023 +0800

    [chore](third-party) Configure the search paths for pkg-config and cmake (#18624)
    
    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 0bc2deb3fa..2ad28cf9f7 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -173,6 +173,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