This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 05411bd [thirdparty] fix autoreconf of protobuf on CentOS
05411bd is described below
commit 05411bd8b365e975e02afa4777300c00559bc578
Author: Alexey Serbin <[email protected]>
AuthorDate: Tue Dec 1 16:27:11 2020 -0800
[thirdparty] fix autoreconf of protobuf on CentOS
This is a follow-up to fd863bb674c01bc792571032f7233ed45e9c9b12.
Change-Id: I8fe0cbc33ca266721bedc8d05ddc09671e989cb5
Reviewed-on: http://gerrit.cloudera.org:8080/16805
Reviewed-by: Grant Henke <[email protected]>
Tested-by: Alexey Serbin <[email protected]>
---
thirdparty/download-thirdparty.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/thirdparty/download-thirdparty.sh
b/thirdparty/download-thirdparty.sh
index c361f36..556d471 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -202,11 +202,19 @@ fetch_and_patch \
"patch -p1 < $TP_DIR/patches/gperftools-unbreak-memz.patch" \
"autoreconf -fvi"
+# NOTE: creating an empty 'third_party/googletest/m4' subdir is a recipe from
+# the $PROTOBUF_SOURCE/autogen.sh file:
+#
+# The absence of a m4 directory in googletest causes autoreconf to fail when
+# building under the CentOS docker image. It's a warning in regular build on
+# Ubuntu/gLinux as well.
+#
PROTOBUF_PATCHLEVEL=0
fetch_and_patch \
protobuf-cpp-${PROTOBUF_VERSION}.tar.gz \
$PROTOBUF_SOURCE \
$PROTOBUF_PATCHLEVEL \
+ "mkdir -p third_party/googletest/m4" \
"autoreconf -fvi"
# Returns 0 if cmake should be patched to work around this bug [1].