Merge pull request #2083 from fwalch/fix-deps-32

deps: Fix building 32-bit Lua rocks.
This commit is contained in:
John Szakmeister 2015-03-02 04:58:44 -05:00
commit 6b7ece6cc8

View File

@ -240,14 +240,22 @@ if(USE_BUNDLED_LUAROCKS)
endif() endif()
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lua_cliargs 2.3-3 COMMAND ${DEPS_BIN_DIR}/luarocks
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install luafilesystem 1.6.3-1 ARGS build lua_cliargs 2.3-3 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install dkjson 2.5-1 COMMAND ${DEPS_BIN_DIR}/luarocks
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install say 1.2-1 ARGS build luafilesystem 1.6.3-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install luassert 1.7.2-0 COMMAND ${DEPS_BIN_DIR}/luarocks
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install ansicolors 1.0.2-3 ARGS build dkjson 2.5-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install penlight 1.0.0-1 COMMAND ${DEPS_BIN_DIR}/luarocks
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install mediator_lua 1.1-3 ARGS build say 1.2-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build luassert 1.7.2-0 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build ansicolors 1.0.2-3 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build penlight 1.0.0-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND ${DEPS_BIN_DIR}/luarocks
ARGS build mediator_lua 1.1-3 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND touch ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps COMMAND touch ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps
DEPENDS luarocks) DEPENDS luarocks)
add_custom_target(stable-busted-deps add_custom_target(stable-busted-deps