You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/05/29 20:11:44 UTC
[1/2] git commit: Fix indentation in configure.ac, NO TABS!
Repository: trafficserver
Updated Branches:
refs/heads/master f6e9da4aa -> e9ac7f6d9
Fix indentation in configure.ac, NO TABS!
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e9ac7f6d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e9ac7f6d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e9ac7f6d
Branch: refs/heads/master
Commit: e9ac7f6d9fbd525c817e3feea8206e1e6625a244
Parents: 1cb12a9
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu May 29 12:09:57 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu May 29 12:10:19 2014 -0600
----------------------------------------------------------------------
configure.ac | 138 +++++++++++++++++++++++++++---------------------------
1 file changed, 69 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e9ac7f6d/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index fa69263..29520c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,11 +334,11 @@ AC_ARG_ENABLE([tproxy],
[AS_HELP_STRING([--enable-tproxy[[=ARG]]],
[Use TPROXY to enable connection transparency.
'auto' or omitted for local system default,
- 'no' to disable,
- 'force' to use built in default,
- number to use as IP_TRANSPARENT sockopt.
- [default=auto]
- ])
+ 'no' to disable,
+ 'force' to use built in default,
+ number to use as IP_TRANSPARENT sockopt.
+ [default=auto]
+ ])
],
[],
[enable_tproxy="auto"]
@@ -369,10 +369,10 @@ AC_SUBST(use_freelist)
if test "x${enable_freelist}" = "xyes"; then
AC_MSG_CHECKING([whether to enable reclaimable freelist])
AC_ARG_ENABLE([reclaimable-freelist],
- [AS_HELP_STRING([--enable-reclaimable-freelist],
- [enable reclaimable freelist support (effective only when freelist is enabled)])],
- [],
- [enable_reclaimable_freelist="no"])
+ [AS_HELP_STRING([--enable-reclaimable-freelist],
+ [enable reclaimable freelist support (effective only when freelist is enabled)])],
+ [],
+ [enable_reclaimable_freelist="no"])
AC_MSG_RESULT([$enable_reclaimable_freelist])
else
enable_reclaimable_freelist="no"
@@ -385,9 +385,9 @@ AC_SUBST(use_reclaimable_freelist)
#
AC_MSG_CHECKING([whether to enable spdy])
AC_ARG_ENABLE([spdy],
- [AS_HELP_STRING([--enable-spdy], [turn on spdy protocol])],
- [],
- [enable_spdy="no"])
+ [AS_HELP_STRING([--enable-spdy], [turn on spdy protocol])],
+ [],
+ [enable_spdy="no"])
AC_MSG_RESULT([$enable_spdy])
TS_ARG_ENABLE_VAR([has], [spdy])
AC_SUBST(has_spdy)
@@ -728,10 +728,10 @@ AS_IF([test -n "$YACC"],
`
AS_IF([test "x$bison_version_check" != "xyes"],
[ YACC=''
- AS_IF([test -z "$bison_version_check"],
- [bison_version_check='no version data']
- )
- ]
+ AS_IF([test -z "$bison_version_check"],
+ [bison_version_check='no version data']
+ )
+ ]
)
],
[ YACC=''
@@ -752,10 +752,10 @@ AS_IF([test -n "$LEX"],
`
AS_IF([test "x$flex_version_check" != "xyes"],
[ LEX=''
- AS_IF([test -z "$flex_version_check"],
- [flex_version_check='no version data']
- )
- ]
+ AS_IF([test -z "$flex_version_check"],
+ [flex_version_check='no version data']
+ )
+ ]
)
],
[ LEX=''
@@ -794,15 +794,15 @@ AX_PROG_PERL_MODULES([ExtUtils::MakeMaker], AM_CONDITIONAL([BUILD_PERL_LIB], [tr
AC_MSG_CHECKING([checking whether to auto-set compiler optimization flags])
has_optimizer_flags=`echo "$CFLAGS $CXXFLAGS" | ${AWK} '$0 !~ /-O.?/{print "no"}'`
AS_IF([test "x${has_optimizer_flags}" = "xno"],
- [
- optimizing_flags='-O3'
- AC_MSG_RESULT([yes ${optimizing_flags}])
- ],
- [
- has_optimizer_flags='yes'
- optimizing_flags=''
- AC_MSG_RESULT([no])
- ]
+ [
+ optimizing_flags='-O3'
+ AC_MSG_RESULT([yes ${optimizing_flags}])
+ ],
+ [
+ has_optimizer_flags='yes'
+ optimizing_flags=''
+ AC_MSG_RESULT([no])
+ ]
)
AM_CONDITIONAL([BUILD_HAVE_LIBCXX], [ false ])
@@ -1050,8 +1050,8 @@ AC_MSG_NOTICE([Build for host OS: $host_os, arch: $host_cpu, optimization: $host
if test "x$enable_ccache" = "xyes"; then
AC_CHECK_PROG([CCACHE],[ccache],[ccache],[])
if test "x${CCACHE}" = "xccache"; then
- CC="$CCACHE $CC"
- CXX="$CCACHE $CXX"
+ CC="$CCACHE $CC"
+ CXX="$CCACHE $CXX"
fi
fi
@@ -1458,8 +1458,8 @@ TS_FLAG_HEADERS([sys/epoll.h \
stdbool.h \
net/ppp_defs.h \
ifaddrs.h\
- readline/readline.h \
- editline/readline.h ])
+ readline/readline.h \
+ editline/readline.h ])
AC_SUBST(sys_epollh)
AC_SUBST(sys_eventh)
@@ -1632,17 +1632,17 @@ AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len], [], [], [#include <netinet/in.h>
if test "x${ac_cv_member_struct_sockaddr_sa_len}" = xyes; then
AC_DEFINE(HAVE_STRUCT_SOCKADDR_SA_LEN, 1,
- [Whether struct sockaddr_in has the sa_len member])
+ [Whether struct sockaddr_in has the sa_len member])
fi
if test "x${ac_cv_member_struct_sockaddr_in_sin_len}" = xyes ; then
AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN_SIN_LEN, 1,
- [Whether struct sockaddr_in has the sin_len member])
+ [Whether struct sockaddr_in has the sin_len member])
fi
if test "x${ac_cv_member_struct_sockaddr_in6_sin6_len}" = xyes; then
AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN, 1,
- [Whether struct sockaddr_in6 has the sin6_len member])
+ [Whether struct sockaddr_in6 has the sin6_len member])
fi
if test "x${with_profiler}" = "xyes"; then
@@ -1702,43 +1702,43 @@ AS_IF([test "x$enable_tproxy" != "xno"], [
AC_MSG_CHECKING([for TPROXY sockopt IP_TRANSPARENT])
case "$enable_tproxy" in
[[0-9][0-9]*])
- ip_transparent=$enable_tproxy
- use_tproxy=1
- AC_MSG_RESULT([forced to $ip_transparent])
- ;;
+ ip_transparent=$enable_tproxy
+ use_tproxy=1
+ AC_MSG_RESULT([forced to $ip_transparent])
+ ;;
force)
- ip_transparent=19
- use_tproxy=1
- AC_MSG_RESULT([forced to $ip_transparent])
- ;;
+ ip_transparent=19
+ use_tproxy=1
+ AC_MSG_RESULT([forced to $ip_transparent])
+ ;;
yes|auto)
AS_IF([test -r $tproxy_header], [
- ip_transparent=`$AWK "/^#define[ \t]+IP_TRANSPARENT[ \t]+[0-9]+/{print \\$3}" $tproxy_header`
- AS_IF([test "x$ip_transparent" != "x"], [
- use_tproxy=1
- AC_MSG_RESULT([set to $ip_transparent])
- ],[
- ip_transparent=0
- AS_IF([test "x$enable_tproxy" = xauto], [
- AC_MSG_RESULT([no])
- ],[
- AC_MSG_RESULT([failed])
- AC_MSG_FAILURE([tproxy feature enabled but the sockopt value was not found in $tproxy_header. Try one of$tproxy_usage_default$tproxy_usage_numeric$tproxy_usage_disable])
- ])
- ])
- ],[
- AS_IF([test "x$enable_tproxy" = xauto], [
- AC_MSG_RESULT([no])
- ],[
- AC_MSG_RESULT([failed])
- AC_MSG_FAILURE([tproxy feature enabled but the header file $tproxy_header was not readable. Try one of$tproxy_usage_default$tproxy_usage_numeric$tproxy_usage_disable])
- ])
- ])
- ;;
+ ip_transparent=`$AWK "/^#define[ \t]+IP_TRANSPARENT[ \t]+[0-9]+/{print \\$3}" $tproxy_header`
+ AS_IF([test "x$ip_transparent" != "x"], [
+ use_tproxy=1
+ AC_MSG_RESULT([set to $ip_transparent])
+ ],[
+ ip_transparent=0
+ AS_IF([test "x$enable_tproxy" = xauto], [
+ AC_MSG_RESULT([no])
+ ],[
+ AC_MSG_RESULT([failed])
+ AC_MSG_FAILURE([tproxy feature enabled but the sockopt value was not found in $tproxy_header. Try one of$tproxy_usage_default$tproxy_usage_numeric$tproxy_usage_disable])
+ ])
+ ])
+ ],[
+ AS_IF([test "x$enable_tproxy" = xauto], [
+ AC_MSG_RESULT([no])
+ ],[
+ AC_MSG_RESULT([failed])
+ AC_MSG_FAILURE([tproxy feature enabled but the header file $tproxy_header was not readable. Try one of$tproxy_usage_default$tproxy_usage_numeric$tproxy_usage_disable])
+ ])
+ ])
+ ;;
*)
- AC_MSG_RESULT([failed])
- AC_MSG_FAILURE([Invalid argument to feature tproxy.$tproxy_usage])
- ;;
+ AC_MSG_RESULT([failed])
+ AC_MSG_FAILURE([Invalid argument to feature tproxy.$tproxy_usage])
+ ;;
esac
])
])
[2/2] git commit: TS-2858 Build failures on OmniOS
Posted by zw...@apache.org.
TS-2858 Build failures on OmniOS
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1cb12a93
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1cb12a93
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1cb12a93
Branch: refs/heads/master
Commit: 1cb12a93a0df96e5c38e77076bcc1337e4caaa31
Parents: f6e9da4
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu May 29 12:07:09 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu May 29 12:10:19 2014 -0600
----------------------------------------------------------------------
CHANGES | 3 +++
configure.ac | 6 ++++--
lib/Makefile.am | 9 ++++++---
plugins/experimental/regex_revalidate/regex_revalidate.c | 7 ++++++-
proxy/Makefile.am | 2 +-
5 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1cb12a93/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 172adbd..dbfc39b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2858] Build failures on OmniOS. Also add some LuaJIT flags as per
+ Theo's and Daniel's recommendations.
+
*) [TS-2857] Cleanup SPDY and SSL stat names
*) [TS-2856] Remove proxy.config.spdy.verbose_in and use diags instead
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1cb12a93/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a324025..fa69263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,6 +652,7 @@ case $host_os in
*amd64*)
TS_ADDTO(CFLAGS, -m64)
TS_ADDTO(CXXFLAGS, -m64)
+ TS_ADDTO(LUA_LDFLAGS, -m64)
;;
esac
;;
@@ -1399,11 +1400,12 @@ AX_LIB_READLINE
# http://luajit.org/install.html.
case $host_os_def in
darwin)
- LUA_LUAJIT_LDFLAGS="-Wl,-pagezero_size,10000 -Wl,-image_base,100000000"
+ TS_LUAJIT_LDFLAGS="-Wl,-pagezero_size,10000 -Wl,-image_base,100000000"
;;
esac
-AC_SUBST(LUA_LUAJIT_LDFLAGS)
+AC_SUBST(TS_LUAJIT_LDFLAGS)
+AC_SUBST(LUA_LDFLAGS)
# We should be able to build http_load if epoll(2) is available.
AM_CONDITIONAL([BUILD_HTTP_LOAD], [test x"$ac_cv_func_epoll_ctl" = x"yes"])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1cb12a93/lib/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6d8dee6..cf45bd6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,13 +36,16 @@ endif
# - Copy the luajit source tree if we're doing out-of-source builds
# - Upon clean, remove the luajit tree from the out-of-source build tree
#
-# ToDo: Can we do this without copying the source? I tried setting the VPATH, but
-# it did not work. Can we make more intelligent build targets, avoiding [ test ] ?
+# Note: The LUA_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
+# the -m64 flag. See configure.ac.
+#
+LUA_CFLAGS=$(CFLAGS) -DLUA_COMPAT_ALL -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+
all-local:
@echo "Making all in luajit"
test -d "$(top_srcdir)/$(subdir)/luajit/src" || (cd "$(top_srcdir)" && git submodule update --init)
test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
- cd luajit && $(MAKE) $(AM_MAKEFLAGS) PREFIX="$(prefix)" CC="$(CC)" CFLAGS="$(CFLAGS)"
+ cd luajit && $(MAKE) $(AM_MAKEFLAGS) PREFIX="$(prefix)" CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@"
clean-local:
test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && make clean)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1cb12a93/plugins/experimental/regex_revalidate/regex_revalidate.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/regex_revalidate/regex_revalidate.c b/plugins/experimental/regex_revalidate/regex_revalidate.c
index 11edebf..4f6baa0 100644
--- a/plugins/experimental/regex_revalidate/regex_revalidate.c
+++ b/plugins/experimental/regex_revalidate/regex_revalidate.c
@@ -32,9 +32,14 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <pcre.h>
#include <ts/ts.h>
+#ifdef HAVE_PCRE_PCRE_H
+# include <pcre/pcre.h>
+#else
+# include <pcre.h>
+#endif
+
#define LOG_PREFIX "regex_revalidate"
#define CONFIG_TMOUT 60000
#define FREE_TMOUT 300000
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1cb12a93/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 755c894..739840a 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -235,7 +235,7 @@ traffic_server_LDADD = \
# On Darwin LuaJIT requires magic link options, otherwise it will crash in luaL_openlibs() at startup. See
# http://luajit.org/install.html.
-traffic_server_LDFLAGS += @LUA_LUAJIT_LDFLAGS@
+traffic_server_LDFLAGS += @TS_LUAJIT_LDFLAGS@
traffic_logcat_SOURCES = logcat.cc
traffic_logcat_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@