This is an automated email from the ASF dual-hosted git repository.
zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 35503cf Support glog on aarch64 (#2563)
35503cf is described below
commit 35503cf8a36b763533687591052d26c0304e8c57
Author: ZHAO Chun <buaa.zh...@gmail.com>
AuthorDate: Wed Dec 25 13:56:15 2019 +0800
Support glog on aarch64 (#2563)
---
thirdparty/build-thirdparty.sh | 4 ++++
thirdparty/download-thirdparty.sh | 2 ++
thirdparty/patches/glog-0.3.3-makefile.patch | 10 ++++++++++
3 files changed, 16 insertions(+)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index e282c80..b77e7af 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -289,6 +289,10 @@ build_glog() {
check_if_source_exist $GLOG_SOURCE
cd $TP_SOURCE_DIR/$GLOG_SOURCE
+ # to generate config.guess and config.sub to support aarch64
+ rm -rf config.*
+ autoreconf -i
+
CPPFLAGS="-I${TP_INCLUDE_DIR} -fpermissive -fPIC" \
LDFLAGS="-L${TP_LIB_DIR}" \
CFLAGS="-fPIC" \
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index f28faff..7c1d99d 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -225,6 +225,8 @@ if [ ! -f $PATCHED_MARK ]; then
patch -p1 < $TP_PATCH_DIR/glog-0.3.3-vlog-double-lock-bug.patch
patch -p1 < $TP_PATCH_DIR/glog-0.3.3-for-palo2.patch
patch -p1 < $TP_PATCH_DIR/glog-0.3.3-remove-unwind-dependency.patch
+ # patch Makefile.am to make autoreconf work
+ patch -p0 < $TP_PATCH_DIR/glog-0.3.3-makefile.patch
touch $PATCHED_MARK
fi
cd -
diff --git a/thirdparty/patches/glog-0.3.3-makefile.patch
b/thirdparty/patches/glog-0.3.3-makefile.patch
new file mode 100644
index 0000000..cb99d4f
--- /dev/null
+++ b/thirdparty/patches/glog-0.3.3-makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.am.orig 2019-12-25 09:42:04.990000000 +0800
++++ Makefile.am 2019-12-25 09:42:26.300000000 +0800
+@@ -1,5 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
++AUTOMAKE_OPTIONS = subdir-objects foreign
++
+ # Make sure that when we re-make ./configure, we get the macros we need
+ ACLOCAL_AMFLAGS = -I m4
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
