You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by rl...@apache.org on 2018/08/29 08:06:48 UTC
incubator-hawq git commit: HAWQ-1656. Fix build issues of Bison
dependency.
Repository: incubator-hawq
Updated Branches:
refs/heads/master da823d7ca -> 6f3337c65
HAWQ-1656. Fix build issues of Bison dependency.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/6f3337c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/6f3337c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/6f3337c6
Branch: refs/heads/master
Commit: 6f3337c656870ef6af2c77b0465a95091b8f6c71
Parents: da823d7
Author: Fenggang <gi...@gmail.com>
Authored: Mon Aug 27 20:56:52 2018 -0400
Committer: rlei <rl...@apache.org>
Committed: Wed Aug 29 16:04:05 2018 +0800
----------------------------------------------------------------------
config/programs.m4 | 8 ++++----
configure | 10 +++++-----
contrib/hawq-docker/centos7-docker/hawq-dev/Dockerfile | 4 +++-
3 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6f3337c6/config/programs.m4
----------------------------------------------------------------------
diff --git a/config/programs.m4 b/config/programs.m4
index 637f47a..e1c0584 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -4,7 +4,7 @@
# PGAC_PATH_BISON
# ---------------
# Look for Bison, set the output variable BISON to its path if found.
-# Reject versions before 1.875 (they have bugs or capacity limits).
+# Reject versions before 1.875 or after 2.9 (they have bugs or capacity limits).
# Note we do not accept other implementations of yacc.
AC_DEFUN([PGAC_PATH_BISON],
@@ -16,11 +16,11 @@ fi
if test "$BISON"; then
pgac_bison_version=`$BISON --version 2>/dev/null | sed q`
AC_MSG_NOTICE([using $pgac_bison_version])
- if echo "$pgac_bison_version" | $AWK '{ if ([$]4 < 1.875) exit 0; else exit 1;}'
+ if echo "$pgac_bison_version" | $AWK '{ if ([$]4 < 1.875 && [$]4 > 2.9) exit 0; else exit 1;}'
then
AC_MSG_WARN([
-*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
-*** Bison version 1.875 or later is required, but this is $pgac_bison_version.])
+*** The installed version of Bison, $BISON, is too old or too new to use with HAWQ.
+*** Bison version between 1.875 and 2.9 is required, but this is $pgac_bison_version.])
BISON=""
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6f3337c6/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 63ac825..b0063d3 100755
--- a/configure
+++ b/configure
@@ -7435,14 +7435,14 @@ if test "$BISON"; then
pgac_bison_version=`$BISON --version 2>/dev/null | sed q`
{ $as_echo "$as_me:${as_lineno-$LINENO}: using $pgac_bison_version" >&5
$as_echo "$as_me: using $pgac_bison_version" >&6;}
- if echo "$pgac_bison_version" | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'
+ if echo "$pgac_bison_version" | $AWK '{ if ($4 < 1.875 && $4 > 2.9) exit 0; else exit 1;}'
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
-*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&5
+*** The installed version of Bison, $BISON, is too old or too new to use with HAWQ.
+*** Bison version between 1.875 and 2.9 is required, but this is $pgac_bison_version." >&5
$as_echo "$as_me: WARNING:
-*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
-*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&2;}
+*** The installed version of Bison, $BISON, is too old or too new to use with HAWQ.
+*** Bison version between 1.875 and 2.9 is required, but this is $pgac_bison_version." >&2;}
BISON=""
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6f3337c6/contrib/hawq-docker/centos7-docker/hawq-dev/Dockerfile
----------------------------------------------------------------------
diff --git a/contrib/hawq-docker/centos7-docker/hawq-dev/Dockerfile b/contrib/hawq-docker/centos7-docker/hawq-dev/Dockerfile
index 58d4ef0..e1678c1 100644
--- a/contrib/hawq-docker/centos7-docker/hawq-dev/Dockerfile
+++ b/contrib/hawq-docker/centos7-docker/hawq-dev/Dockerfile
@@ -23,7 +23,7 @@ MAINTAINER Richard Guo <ri...@pivotal.io>
RUN yum install -y epel-release && \
yum makecache && \
yum install -y man passwd sudo tar which git mlocate links make bzip2 net-tools \
- autoconf automake libtool m4 gcc gcc-c++ gdb bison flex cmake gperf maven indent \
+ autoconf automake libtool m4 gcc gcc-c++ gdb flex cmake gperf maven indent \
libuuid-devel krb5-devel libgsasl-devel expat-devel libxml2-devel \
perl-ExtUtils-Embed pam-devel python-devel libcurl-devel snappy-devel \
thrift-devel libyaml-devel libevent-devel bzip2-devel openssl-devel \
@@ -33,6 +33,8 @@ RUN yum install -y epel-release && \
openssh-clients openssh-server perl-JSON && \
yum clean all
+RUN rpm -ivh --nodeps https://rpmfind.net/linux/centos/6.10/os/x86_64/Packages/bison-2.4.1-5.el6.x86_64.rpm
+
RUN pip --retries=50 --timeout=300 install pycrypto
# OS requirement