From 1d4506ee172d90d2a931c019dcd8ecca3ed151d1 Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Mon, 15 Aug 2016 05:45:28 -0400 Subject: third-party: force the use of penlight 1.3.2-2 until busted is fixed penlight 1.4.0 changed how files are being globbed and busted hasn't been updated accordingly yet. See Olivine-Labs/busted#528 for more information. --- third-party/cmake/BuildLuarocks.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 7535475ed5..cbc1959d4f 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -127,10 +127,17 @@ add_custom_target(inspect list(APPEND THIRD_PARTY_DEPS inspect) if(USE_BUNDLED_BUSTED) + add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2 + COMMAND ${LUAROCKS_BINARY} + ARGS build penlight 1.3.2-2 ${LUAROCKS_BUILDARGS} + DEPENDS inspect) + add_custom_target(penlight + DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2) + add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted COMMAND ${LUAROCKS_BINARY} ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc11-0/busted-2.0.rc11-0.rockspec ${LUAROCKS_BUILDARGS} - DEPENDS inspect) + DEPENDS penlight) add_custom_target(busted DEPENDS ${HOSTDEPS_BIN_DIR}/busted) -- cgit