You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2014/09/24 22:56:40 UTC
git commit: Build error fixes (Bison/Flex version check,
ssl_cert_loader)
Repository: trafficserver
Updated Branches:
refs/heads/master 60e8d9764 -> 676482c58
Build error fixes (Bison/Flex version check, ssl_cert_loader)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/676482c5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/676482c5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/676482c5
Branch: refs/heads/master
Commit: 676482c5851ebe51393ed017f1a9e0b590e98746
Parents: 60e8d97
Author: Alan M. Carroll <am...@apache.org>
Authored: Wed Sep 24 15:56:07 2014 -0500
Committer: Alan M. Carroll <am...@apache.org>
Committed: Wed Sep 24 15:56:07 2014 -0500
----------------------------------------------------------------------
configure.ac | 15 +++++----------
.../experimental/ssl_cert_loader/ssl-cert-loader.cc | 1 -
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/676482c5/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index e3b18ae..e2f5276 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,17 +783,12 @@ AS_IF([test -n "$LEX"],
]
)
-AS_IF([test "x$enable_wccp" = "xyes"],
- [
- AS_IF([test -z "$LEX" ],
- AC_MSG_ERROR([Need flex version $FLEX_MAJOR.$FLEX_MINOR.$FLEX_POINT or better to enable WCCP (found $flex_version_check)])
- )
-
- AS_IF([test -z "$YACC" ],
- AC_MSG_ERROR([Need bison version $BISON_MAJOR.$BISON_MINOR.$BISON_POINT or better to enable WCCP (found $bison_version_check)])
- )
+AS_IF([test -z "$LEX" ],
+ AC_MSG_ERROR([Need flex version $FLEX_MAJOR.$FLEX_MINOR.$FLEX_POINT or better to enable WCCP (found $flex_version_check)])
+)
- ]
+AS_IF([test -z "$YACC" ],
+ AC_MSG_ERROR([Need bison version $BISON_MAJOR.$BISON_MINOR.$BISON_POINT or better to enable WCCP (found $bison_version_check)])
)
# Check for Perl and Doxygen
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/676482c5/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index 1385468..61a3236 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -8,7 +8,6 @@
# include <inttypes.h>
# include <ts/ts.h>
# include <tsconfig/TsValue.h>
-# include <alloca.h>
# include <openssl/ssl.h>
# include <openssl/x509.h>
# include <openssl/x509v3.h>
Re: git commit: Build error fixes (Bison/Flex version check, ssl_cert_loader)
Posted by "Alan M. Carroll" <am...@network-geographics.com>.
Wednesday, September 24, 2014, 5:28:02 PM, you wrote:
> OS X and RHEL 5 both have Bison 2.3 (also the error message is now misleading because I did not --enable-wccp)
I changed this by committing the generated files and tweaking the TsConfig make file to depend on those where the Bison/Flex versions are inadequate. So you can't usefully change the .y/.l file easily on OS X or RHEL 5, but it will build. On other operating systems the build will depend on the .y/.l files and regenerate the output files iff the .y/.l files have been changed. This should prevent spurious commits from building.
Re: git commit: Build error fixes (Bison/Flex version check,
ssl_cert_loader)
Posted by James Peach <jp...@apache.org>.
On Sep 24, 2014, at 1:56 PM, amc@apache.org wrote:
> Repository: trafficserver
> Updated Branches:
> refs/heads/master 60e8d9764 -> 676482c58
>
>
> Build error fixes (Bison/Flex version check, ssl_cert_loader)
oarfish:trafficserver.git jpeach$ ./configure
...
configure: error: Need bison version 2.4.1 or better to enable WCCP (found version 2.3.0)
OS X and RHEL 5 both have Bison 2.3 (also the error message is now misleading because I did not --enable-wccp)
>
>
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/676482c5
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/676482c5
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/676482c5
>
> Branch: refs/heads/master
> Commit: 676482c5851ebe51393ed017f1a9e0b590e98746
> Parents: 60e8d97
> Author: Alan M. Carroll <am...@apache.org>
> Authored: Wed Sep 24 15:56:07 2014 -0500
> Committer: Alan M. Carroll <am...@apache.org>
> Committed: Wed Sep 24 15:56:07 2014 -0500
>
> ----------------------------------------------------------------------
> configure.ac | 15 +++++----------
> .../experimental/ssl_cert_loader/ssl-cert-loader.cc | 1 -
> 2 files changed, 5 insertions(+), 11 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/676482c5/configure.ac
> ----------------------------------------------------------------------
> diff --git a/configure.ac b/configure.ac
> index e3b18ae..e2f5276 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -783,17 +783,12 @@ AS_IF([test -n "$LEX"],
> ]
> )
>
> -AS_IF([test "x$enable_wccp" = "xyes"],
> - [
> - AS_IF([test -z "$LEX" ],
> - AC_MSG_ERROR([Need flex version $FLEX_MAJOR.$FLEX_MINOR.$FLEX_POINT or better to enable WCCP (found $flex_version_check)])
> - )
> -
> - AS_IF([test -z "$YACC" ],
> - AC_MSG_ERROR([Need bison version $BISON_MAJOR.$BISON_MINOR.$BISON_POINT or better to enable WCCP (found $bison_version_check)])
> - )
> +AS_IF([test -z "$LEX" ],
> + AC_MSG_ERROR([Need flex version $FLEX_MAJOR.$FLEX_MINOR.$FLEX_POINT or better to enable WCCP (found $flex_version_check)])
> +)
>
> - ]
> +AS_IF([test -z "$YACC" ],
> + AC_MSG_ERROR([Need bison version $BISON_MAJOR.$BISON_MINOR.$BISON_POINT or better to enable WCCP (found $bison_version_check)])
> )
>
> # Check for Perl and Doxygen
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/676482c5/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> ----------------------------------------------------------------------
> diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> index 1385468..61a3236 100644
> --- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> +++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> @@ -8,7 +8,6 @@
> # include <inttypes.h>
> # include <ts/ts.h>
> # include <tsconfig/TsValue.h>
> -# include <alloca.h>
> # include <openssl/ssl.h>
> # include <openssl/x509.h>
> # include <openssl/x509v3.h>
>
Re: git commit: Build error fixes (Bison/Flex version check,
ssl_cert_loader)
Posted by James Peach <jp...@apache.org>.
On Sep 24, 2014, at 1:56 PM, amc@apache.org wrote:
> Repository: trafficserver
> Updated Branches:
> refs/heads/master 60e8d9764 -> 676482c58
>
>
> Build error fixes (Bison/Flex version check, ssl_cert_loader)
oarfish:trafficserver.git jpeach$ ./configure
...
configure: error: Need bison version 2.4.1 or better to enable WCCP (found version 2.3.0)
OS X and RHEL 5 both have Bison 2.3 (also the error message is now misleading because I did not --enable-wccp)
>
>
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/676482c5
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/676482c5
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/676482c5
>
> Branch: refs/heads/master
> Commit: 676482c5851ebe51393ed017f1a9e0b590e98746
> Parents: 60e8d97
> Author: Alan M. Carroll <am...@apache.org>
> Authored: Wed Sep 24 15:56:07 2014 -0500
> Committer: Alan M. Carroll <am...@apache.org>
> Committed: Wed Sep 24 15:56:07 2014 -0500
>
> ----------------------------------------------------------------------
> configure.ac | 15 +++++----------
> .../experimental/ssl_cert_loader/ssl-cert-loader.cc | 1 -
> 2 files changed, 5 insertions(+), 11 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/676482c5/configure.ac
> ----------------------------------------------------------------------
> diff --git a/configure.ac b/configure.ac
> index e3b18ae..e2f5276 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -783,17 +783,12 @@ AS_IF([test -n "$LEX"],
> ]
> )
>
> -AS_IF([test "x$enable_wccp" = "xyes"],
> - [
> - AS_IF([test -z "$LEX" ],
> - AC_MSG_ERROR([Need flex version $FLEX_MAJOR.$FLEX_MINOR.$FLEX_POINT or better to enable WCCP (found $flex_version_check)])
> - )
> -
> - AS_IF([test -z "$YACC" ],
> - AC_MSG_ERROR([Need bison version $BISON_MAJOR.$BISON_MINOR.$BISON_POINT or better to enable WCCP (found $bison_version_check)])
> - )
> +AS_IF([test -z "$LEX" ],
> + AC_MSG_ERROR([Need flex version $FLEX_MAJOR.$FLEX_MINOR.$FLEX_POINT or better to enable WCCP (found $flex_version_check)])
> +)
>
> - ]
> +AS_IF([test -z "$YACC" ],
> + AC_MSG_ERROR([Need bison version $BISON_MAJOR.$BISON_MINOR.$BISON_POINT or better to enable WCCP (found $bison_version_check)])
> )
>
> # Check for Perl and Doxygen
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/676482c5/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> ----------------------------------------------------------------------
> diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> index 1385468..61a3236 100644
> --- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> +++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
> @@ -8,7 +8,6 @@
> # include <inttypes.h>
> # include <ts/ts.h>
> # include <tsconfig/TsValue.h>
> -# include <alloca.h>
> # include <openssl/ssl.h>
> # include <openssl/x509.h>
> # include <openssl/x509v3.h>
>