Skip to content

Commit

Permalink
HAWQ-1656. Fix build issues of Bison dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
ginobiliwang authored and rlei committed Aug 29, 2018
1 parent da823d7 commit 6f3337c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
8 changes: 4 additions & 4 deletions config/programs.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion contrib/hawq-docker/centos7-docker/hawq-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ MAINTAINER Richard Guo <[email protected]>
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 \
Expand All @@ -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
Expand Down

0 comments on commit 6f3337c

Please sign in to comment.