You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2016/02/02 07:55:27 UTC
[4/9] incubator-kudu git commit: Revert "Remove autoreconf calls in
download-thirdparty.sh"
Revert "Remove autoreconf calls in download-thirdparty.sh"
This reverts commit ee13c00a5df5d4ad1cac05b49048a9eae256e2f2.
Change-Id: Ifb5f09e9b4e710585cba6d7b34c198b549884eb8
Reviewed-on: http://gerrit.cloudera.org:8080/1972
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Dan Burkert <da...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/4cc1a03b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/4cc1a03b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/4cc1a03b
Branch: refs/heads/master
Commit: 4cc1a03b9c9ca2dd0452960ded6e0c541e58df14
Parents: 7a68e1f
Author: Dan Burkert <da...@cloudera.com>
Authored: Sat Jan 30 03:12:18 2016 +0000
Committer: Dan Burkert <da...@cloudera.com>
Committed: Sat Jan 30 17:19:04 2016 +0000
----------------------------------------------------------------------
thirdparty/download-thirdparty.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/4cc1a03b/thirdparty/download-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index f50eb9f..575ea19 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -17,6 +17,9 @@
# specific language governing permissions and limitations
# under the License.
+# autoreconf calls are necessary to fix hard-coded aclocal versions in the
+# configure scripts that ship with the projects.
+
set -e
TP_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
@@ -71,6 +74,7 @@ if [ ! -d $GLOG_DIR ]; then
pushd $GLOG_DIR
patch -p0 < $TP_DIR/patches/glog-issue-198-fix-unused-warnings.patch
touch patchlevel-$GLOG_PATCHLEVEL
+ autoreconf -fvi
popd
echo
fi
@@ -95,12 +99,16 @@ if [ ! -d $GPERFTOOLS_DIR ]; then
patch -p1 < $TP_DIR/patches/gperftools-Change-default-TCMALLOC_TRANSFER_NUM_OBJ-to-40.patch
patch -p1 < $TP_DIR/patches/gperftools-hook-mi_force_unlock-on-OSX-instead-of-pthread_atfork.patch
touch patchlevel-$GPERFTOOLS_PATCHLEVEL
+ autoreconf -fvi
popd
echo
fi
if [ ! -d $PROTOBUF_DIR ]; then
fetch_and_expand protobuf-${PROTOBUF_VERSION}.tar.gz
+ pushd $PROTOBUF_DIR
+ autoreconf -fvi
+ popd
fi
if [ ! -d $CMAKE_DIR ]; then
@@ -109,6 +117,9 @@ fi
if [ ! -d $SNAPPY_DIR ]; then
fetch_and_expand snappy-${SNAPPY_VERSION}.tar.gz
+ pushd $SNAPPY_DIR
+ autoreconf -fvi
+ popd
fi
if [ ! -d $ZLIB_DIR ]; then