[trafficserver] branch master updated: Cleanup, and adds support for new luajit option

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 350c360  Cleanup, and adds support for new luajit option
350c360 is described below

commit 350c360073e1e7aabff3618b7063859431e9e4fb
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Wed Sep 5 07:26:55 2018 -0600

    Cleanup, and adds support for new luajit option
---
 ci/jenkins/bin/clang-analyzer.sh | 2 +-
 ci/jenkins/bin/environment.sh    | 2 +-
 ci/jenkins/bin/github.sh         | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci/jenkins/bin/clang-analyzer.sh b/ci/jenkins/bin/clang-analyzer.sh
index d3b5b87..fac9938 100755
--- a/ci/jenkins/bin/clang-analyzer.sh
+++ b/ci/jenkins/bin/clang-analyzer.sh
@@ -24,7 +24,7 @@ OUTPUT_BASE=${OUTPUT_BASE:-/home/jenkins/clang-analyzer}
 
 # Options
 options="--status-bugs --keep-empty"
-configure="--enable-experimental-plugins"
+configure="--enable-experimental-plugins --enable-luajit"
 
 # Additional checkers
 # Phil says these are all FP's: -enable-checker alpha.security.ArrayBoundV2
diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index 3239815..079035f 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -61,7 +61,7 @@ test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}" && enable_clang=1
 
 if [ "1" == "$enable_clang" ]; then
     if [ -x "/usr/local/bin/clang++50" ]; then
-        # For FreeBSD
+        # For FreeBSD 11.1 or earlier *NOT* recommended since libc++ is LLVM 4.0
         export CC="/usr/local/bin/clang50"
         export CXX="/usr/local/bin/clang++50"
     elif [ -x "/usr/bin/clang++-5.0" ]; then
diff --git a/ci/jenkins/bin/github.sh b/ci/jenkins/bin/github.sh
index ff884ea..82271fe 100755
--- a/ci/jenkins/bin/github.sh
+++ b/ci/jenkins/bin/github.sh
@@ -25,10 +25,12 @@ CCACHE=""
 WERROR=""
 DEBUG=""
 WCCP=""
+LUAJIT=""
 [ "1" == "$enable_ccache" ] && CCACHE="--enable-ccache"
 [ "1" == "$enable_werror" ] && WERROR="--enable-werror"
 [ "1" == "$enable_debug" ] && DEBUG="--enable-debug"
 [ "1" == "$enable_wccp" ] && WCCP="--enable-wccp"
+[ "1" == "$enable_luajit" ] && LUAJIT="--enable-luajit"
 
 mkdir -p ${INSTALL}
 cd src
@@ -37,6 +39,7 @@ echo "CCACHE: $CCACHE"
 echo "WERROR: $WERROR"
 echo "DEBUG: $DEBUG"
 echo "WCCP: $WCCP"
+echo "LUAJIT: $LUAJIT"
 
 # Restore verbose shell output
 set -x
@@ -50,6 +53,7 @@ autoreconf -if
     --enable-example-plugins \
     ${CCACHE} \
     ${WCCP} \
+    ${LUAJIT} \
     ${WERROR} \
     ${DEBUG}