| Message ID | 20191007040250.23281-1-francois.perrad@gadz.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/lua-sdl2: fix install path | expand |
Hello, On Mon, Oct 07, 2019 at 01:02 AM, Francois Perrad wrote: > WITH_LUAVER must be set with a value depending of Lua interpreter, > by this way, the module is installed in the correct location > > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [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] Tested-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> 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
Hello François, On Mon, 7 Oct 2019 06:02:50 +0200 Francois Perrad <fperrad@gmail.com> wrote: > WITH_LUAVER must be set with a value depending of Lua interpreter, > by this way, the module is installed in the correct location > > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> > --- > package/lua-sdl2/lua-sdl2.mk | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/package/lua-sdl2/lua-sdl2.mk b/package/lua-sdl2/lua-sdl2.mk > index a1e54bfde..e0ed0b7e2 100644 > --- a/package/lua-sdl2/lua-sdl2.mk > +++ b/package/lua-sdl2/lua-sdl2.mk > @@ -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. > +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
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes: > WITH_LUAVER must be set with a value depending of Lua interpreter, > by this way, the module is installed in the correct location > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Committed to 2019.02.x and 2019.08.x, thanks.
diff --git a/package/lua-sdl2/lua-sdl2.mk b/package/lua-sdl2/lua-sdl2.mk index a1e54bfde..e0ed0b7e2 100644 --- a/package/lua-sdl2/lua-sdl2.mk +++ b/package/lua-sdl2/lua-sdl2.mk @@ -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
WITH_LUAVER must be set with a value depending of Lua interpreter, by this way, the module is installed in the correct location Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- package/lua-sdl2/lua-sdl2.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)