Disable lua waf where luajit is not available (#2306)

This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-04-07 15:27:10 -03:00 committed by GitHub
parent fd458df0a6
commit 888b74b336
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -204,32 +204,33 @@ if [[ (${ARCH} != "ppc64le") && (${ARCH} != "s390x") ]]; then
export LUAJIT_LIB=/usr/local/lib
export LUAJIT_INC=/usr/local/include/luajit-2.1
export LUA_LIB_DIR="$LUAJIT_LIB/lua"
cd "$BUILD_PATH/lua-resty-core-0.1.14rc1"
make install
cd "$BUILD_PATH/lua-resty-lrucache-0.07"
make install
cd "$BUILD_PATH/lua-resty-lock-0.07"
make install
cd "$BUILD_PATH/lua-resty-iputils-0.3.0"
make install
cd "$BUILD_PATH/lua-resty-upload-0.10"
make install
cd "$BUILD_PATH/lua-resty-dns-0.21rc2"
make install
cd "$BUILD_PATH/lua-resty-string-0.11rc1"
make install
# build and install lua-resty-waf with dependencies
/install_lua_resty_waf.sh
fi
cd "$BUILD_PATH/lua-resty-core-0.1.14rc1"
make install
cd "$BUILD_PATH/lua-resty-lrucache-0.07"
make install
cd "$BUILD_PATH/lua-resty-lock-0.07"
make install
cd "$BUILD_PATH/lua-resty-iputils-0.3.0"
make install
cd "$BUILD_PATH/lua-resty-upload-0.10"
make install
cd "$BUILD_PATH/lua-resty-dns-0.21rc2"
make install
cd "$BUILD_PATH/lua-resty-string-0.11rc1"
make install
# build and install lua-resty-waf with dependencies
/install_lua_resty_waf.sh
# build opentracing lib
cd "$BUILD_PATH/opentracing-cpp-$OPENTRACING_CPP_VERSION"
mkdir .build