hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esp...@apache.org
Subject incubator-hawq git commit: HAWQ-1397. Support Flex versions 2.6 and above.
Date Wed, 22 Mar 2017 05:17:44 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master efaf24ea4 -> c89b3e2ca


HAWQ-1397. Support Flex versions 2.6 and above.

* The FLEX configure snippet came from Postgres upstream in the form
  of two commits (see below).
* Misc change: commit tomcat version check for Mac OSX platform using
  brew. This change was out of sync with generated "configure" script.

commit 7d7b129277eb545286aecf29ec22b5bb7fdf46bd
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date:   Mon May 2 11:18:10 2016 -0400

    Fix configure's incorrect version tests for flex and perl.

    awk's equality-comparison operator is "==" not "=".  We got this right
    in many places, but not in configure's checks for supported version
    numbers of flex and perl.  It hadn't been noticed because unsupported
    versions are so old as to be basically extinct in the wild, and because
    the only consequence is whether or not a WARNING flies by during
    configure.

    Daniel Gustafsson noted the problem with respect to the test for flex,
    I found the other by reviewing other awk calls.

commit 32f15d05c80044335f97347b5406f6736c06a033
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date:   Wed Nov 18 17:45:05 2015 -0500

    Accept flex > 2.5.x in configure.

    Per buildfarm member anchovy, 2.6.0 exists in the wild now.
    Hopefully it works with Postgres; if not, we'll have to do something
    about that, but in any case claiming it's "too old" is pretty silly.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/c89b3e2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/c89b3e2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/c89b3e2c

Branch: refs/heads/master
Commit: c89b3e2cafb099e46661a477f5fe64b908791824
Parents: efaf24e
Author: Ed Espino <eespino@pivotal.io>
Authored: Tue Mar 21 10:30:33 2017 -0700
Committer: Ed Espino <eespino@pivotal.io>
Committed: Tue Mar 21 20:57:52 2017 -0700

----------------------------------------------------------------------
 config/programs.m4 | 2 +-
 config/tomcat.m4   | 2 ++
 configure          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c89b3e2c/config/programs.m4
----------------------------------------------------------------------
diff --git a/config/programs.m4 b/config/programs.m4
index 0ebfc65..637f47a 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -69,7 +69,7 @@ else
         echo '%%'  > conftest.l
         if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null
2>&1; then
           pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
-          if echo "$pgac_flex_version" | sed ['s/[^0-9]/ /g'] | $AWK '{ if ([$]1 = 2 &&
[$]2 = 5 && [$]3 >= 4) exit 0; else exit 1;}'
+          if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 == 2 &&
([$]2 > 5 || ([$]2 == 5 && [$]3 >= 4))) exit 0; else exit 1;}'
           then
             pgac_cv_path_flex=$pgac_candidate
             break 2

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c89b3e2c/config/tomcat.m4
----------------------------------------------------------------------
diff --git a/config/tomcat.m4 b/config/tomcat.m4
index 9e122a3..f2d744a 100644
--- a/config/tomcat.m4
+++ b/config/tomcat.m4
@@ -13,6 +13,8 @@ AC_DEFUN([PGAC_CATALINA_HOME],
   dnl /usr/lib/bigtop-tomcat
   if test -x "${CATALINA_HOME}/bin/catalina.sh"; then
     TOMCAT="${CATALINA_HOME}"
+  elif test -x "/usr/local/Cellar/tomcat@6/6.0.45/libexec/bin/catalina.sh"; then
+    TOMCAT="/usr/local/Cellar/tomcat@6/6.0.45/libexec/"
   elif test -x "/usr/lib/bigtop-tomcat/bin/catalina.sh"; then
     TOMCAT="/usr/lib/bigtop-tomcat/"
   else

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c89b3e2c/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 14f88e4..4230fa1 100755
--- a/configure
+++ b/configure
@@ -7488,7 +7488,7 @@ else
         echo '%%'  > conftest.l
         if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null
2>&1; then
           pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
-          if echo "$pgac_flex_version" | sed 's/[^0-9]/ /g' | $AWK '{ if ($1 = 2 &&
$2 = 5 && $3 >= 4) exit 0; else exit 1;}'
+          if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 == 2 &&
($2 > 5 || ($2 == 5 && $3 >= 4))) exit 0; else exit 1;}'
           then
             pgac_cv_path_flex=$pgac_candidate
             break 2


Mime
View raw message