package/lua-sdl2: fix install path
PATCH 1/1 package/lua-sdl2: fix install path
WITH_LUAVER must be set with a value depending of Lua interpreter, by this way, the module is installed in the correct location
--- package/lua-sdl2/lua-sdl2.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
package/lua-sdl2/lua-sdl2.mk +11 -1
@@ -10,7 +10,17 @@ LUA_SDL2_LICENSE = ISC LUA_SDL2_LICENSE_FILES = LICENSE LUA_SDL2_DEPENDENCIES = luainterpreter sdl2 -LUA_SDL2_CONF_OPTS += -DWITH_LUAVER=user -DLUA_INCLUDE_DIR=$(STAGING_DIR)/usr/include +ifeq ($(BR2_PACKAGE_LUAJIT),y) +LUA_SDL2_LUAVER=JIT +else +ifeq ($(BR2_PACKAGE_LUA_5_3),y) +LUA_SDL2_LUAVER=53 +else +LUA_SDL2_LUAVER=51 +endif +endif + +LUA_SDL2_CONF_OPTS += -DWITH_LUAVER=$(LUA_SDL2_LUAVER) -DLUA_INCLUDE_DIR=$(STAGING_DIR)/usr/include ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y) LUA_SDL2_DEPENDENCIES += sdl2_image
Signature · 1 line
2.20.1
PATCH 1/1 package/lua-sdl2: fix install path
Hello,
Quoted 4 lines · Francois Perrad
WITH_LUAVERmust be set with a value depending of Lua interpreter, by this way, the module is installed in the correct locationSigned-off-by Francois Perrad <[email protected]>
[Before this patch the 2 runtime tests from
http://patchwork.ozlabs.org/patch/1169002/
fail and after this patch the same test cases do pass]
Failing before this patch:
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/312517926
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/312517929
Passing after this patch:
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/314232922
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/314232995
Regards,
Ricardo
PATCH 1/1 package/lua-sdl2: fix install path
In reply to Francois PerradHello Fran?ois,
Quoted 13 lines · On Mon, 7 Oct 2019 06:02:50 +0200 Francois Perrad <[email protected]> wrote:
WITH_LUAVERmust be set with a value depending of Lua interpreter, by this way, the module is installed in the correct locationSigned-off-by Francois Perrad <[email protected]>--- package/lua-sdl2/lua-sdl2.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)package/lua-sdl2/lua-sdl2.mk +0
-0
package/lua-sdl2/lua-sdl2.mk LUA_SDL2_LICENSE = ISC · line 14
Quoted 6 lines
package/lua-sdl2/lua-sdl2.mk +2
-1@@ -10,7 +10,17 @@ LUA_SDL2_LICENSE = ISC LUA_SDL2_LICENSE_FILES = LICENSE LUA_SDL2_DEPENDENCIES = luainterpreter sdl2 -LUA_SDL2_CONF_OPTS += -DWITH_LUAVER=user -DLUA_INCLUDE_DIR=$(STAGING_DIR)/usr/include +ifeq ($(BR2_PACKAGE_LUAJIT),y) +LUA_SDL2_LUAVER=JIT
We put spaces around = sign.
package/lua-sdl2/lua-sdl2.mk LUA_SDL2_LICENSE = ISC · line 16
Quoted 2 lines
package/lua-sdl2/lua-sdl2.mk +2
-0+else +ifeq ($(BR2_PACKAGE_LUA_5_3),y)
This should have been written as:
else ifeq (...)
this way, you don't enter another conditional block, and you don't need the double "endif".
I fixed that, and applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/lua-sdl2: fix install path
In reply to Francois PerradQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Francois" == Francois Perrad <[email protected]> writes:
WITH_LUAVERmust be set with a value depending of Lua interpreter, by this way, the module is installed in the correct locationSigned-off-by Francois Perrad <[email protected]>
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard