You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/01/10 17:05:14 UTC
[doris] 01/02: [chore](macOS) Don't build useless third-party stuff (#15763)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
commit e3aad63f74fec7a323091ecf7580362fcac52f88
Author: Adonis Ling <ad...@gmail.com>
AuthorDate: Wed Jan 11 00:20:37 2023 +0800
[chore](macOS) Don't build useless third-party stuff (#15763)
On macOS, we need some extra libraries to build the codebase,
therefore two packages were introduced to the project. They are `binutils` and `gettext`.
It takes a lot of time to build these packages completely. This PR introduces a way to build the needed libraries
and other stuff are skipped to build. It can save the time to build the third-party libraries on macOS.
---
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 6e64b89f5c..641a870350 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1059,7 +1059,7 @@ build_bitshuffle() {
if [[ ! -f "${nm}" ]]; then nm="$(command -v nm)"; fi
if [[ ! -f "${objcopy}" ]]; then
if ! objcopy="$(command -v objcopy)"; then
- objcopy="${TP_INSTALL_DIR}/bin/objcopy"
+ objcopy="${TP_INSTALL_DIR}/binutils/bin/objcopy"
fi
fi
@@ -1507,9 +1507,10 @@ build_binutils() {
mkdir -p "${BUILD_DIR}"
cd "${BUILD_DIR}"
- ../configure --prefix="${TP_INSTALL_DIR}" --enable-install-libiberty
+ ../configure --prefix="${TP_INSTALL_DIR}/binutils" --includedir="${TP_INCLUDE_DIR}" --libdir="${TP_LIB_DIR}" \
+ --enable-install-libiberty --without-msgpack
make -j "${PARALLEL}"
- make install
+ make install-bfd install-libiberty install-binutils
}
build_gettext() {
@@ -1520,7 +1521,8 @@ build_gettext() {
mkdir -p "${BUILD_DIR}"
cd "${BUILD_DIR}"
- ../configure --prefix="${TP_INSTALL_DIR}" --disable-java
+ ../gettext-runtime/configure --prefix="${TP_INSTALL_DIR}" --disable-java
+ cd intl
make -j "${PARALLEL}"
make install
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org