You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by pa...@apache.org on 2022/07/31 05:26:14 UTC
[doris] branch master updated: [fix](thirdparty) fix compile error: missing libbrpc.a (#11353)
This is an automated email from the ASF dual-hosted git repository.
panxiaolei 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 ab7e65112c [fix](thirdparty) fix compile error: missing libbrpc.a (#11353)
ab7e65112c is described below
commit ab7e65112caeaf3fba7db506d461fc4bff8d3f81
Author: luozenglin <37...@users.noreply.github.com>
AuthorDate: Sun Jul 31 13:26:08 2022 +0800
[fix](thirdparty) fix compile error: missing libbrpc.a (#11353)
fix compile error, add fpic to brpc dependency library
---
thirdparty/build-thirdparty.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 70a848fb2e..ac10258769 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -345,7 +345,7 @@ build_protobuf() {
ldflags="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc -Wl,--undefined=pthread_create"
fi
- CXXFLAGS="-O2 -I${TP_INCLUDE_DIR}" \
+ CXXFLAGS="-fPIC -O2 -I${TP_INCLUDE_DIR}" \
LDFLAGS="${ldflags}" \
./configure --prefix="${TP_INSTALL_DIR}" --disable-shared --enable-static --with-zlib="${TP_INSTALL_DIR}/include"
@@ -385,8 +385,9 @@ build_glog() {
rm -rf config.*
autoreconf -i
- CPPFLAGS="-I${TP_INCLUDE_DIR} -fpermissive" \
+ CPPFLAGS="-I${TP_INCLUDE_DIR} -fpermissive -fPIC" \
LDFLAGS="-L${TP_LIB_DIR}" \
+ CFLAGS="-fPIC" \
./configure --prefix="${TP_INSTALL_DIR}" --enable-frame-pointers --disable-shared --enable-static
make -j "${PARALLEL}" && make install
}
@@ -458,6 +459,7 @@ build_zlib() {
CPPFLAGS="-I${TP_INCLUDE_DIR}" \
LDFLAGS="-L${TP_LIB_DIR}" \
+ CFLAGS="-fPIC" \
./configure --prefix="${TP_INSTALL_DIR}" --static
make -j "${PARALLEL}" && make install
@@ -550,7 +552,7 @@ build_hyperscan() {
cd $TP_SOURCE_DIR/$HYPERSCAN_SOURCE
mkdir -p $BUILD_DIR && cd $BUILD_DIR
PATH=$TP_INSTALL_DIR/bin:$PATH ${CMAKE_CMD} -G "${GENERATOR}" -DBUILD_SHARED_LIBS=0 \
- -DBOOST_ROOT=$BOOST_SOURCE -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR ..
+ -DBOOST_ROOT=$BOOST_SOURCE -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR -DBUILD_EXAMPLES=OFF ..
${BUILD_SYSTEM} -j $PARALLEL install
}
@@ -621,7 +623,7 @@ build_leveldb() {
mkdir -p "${BUILD_DIR}" && cd "${BUILD_DIR}"
rm -rf CMakeCache.txt CMakeFiles/
- "${CMAKE_CMD}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" -DLEVELDB_BUILD_BENCHMARKS=OFF \
+ CXXFLAGS="-fPIC" "${CMAKE_CMD}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" -DLEVELDB_BUILD_BENCHMARKS=OFF \
-DLEVELDB_BUILD_TESTS=OFF ..
"${BUILD_SYSTEM}" -j "${PARALLEL}" install
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org