Support glog on aarch64 (#2563)
This commit is contained in:
4
thirdparty/build-thirdparty.sh
vendored
4
thirdparty/build-thirdparty.sh
vendored
@ -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" \
|
||||
|
||||
2
thirdparty/download-thirdparty.sh
vendored
2
thirdparty/download-thirdparty.sh
vendored
@ -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 -
|
||||
|
||||
10
thirdparty/patches/glog-0.3.3-makefile.patch
vendored
Normal file
10
thirdparty/patches/glog-0.3.3-makefile.patch
vendored
Normal file
@ -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
|
||||
|
||||
Reference in New Issue
Block a user