<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le lun. 27 juil. 2020 à 16:00, Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com">thomas.petazzoni@bootlin.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello François,<br>
<br>
Most issues are small details, except the last one, which really needs<br>
a reply from you.<br>
<br>
On Thu,  2 Jul 2020 22:22:20 +0200<br>
Francois Perrad <<a href="mailto:fperrad@gmail.com" target="_blank">fperrad@gmail.com</a>> wrote:<br>
<br>
> diff --git a/package/lua/<a href="http://lua.mk" rel="noreferrer" target="_blank">lua.mk</a> b/package/lua/<a href="http://lua.mk" rel="noreferrer" target="_blank">lua.mk</a><br>
> index ce75af6b0..0b6d2c1dc 100644<br>
> --- a/package/lua/<a href="http://lua.mk" rel="noreferrer" target="_blank">lua.mk</a><br>
> +++ b/package/lua/<a href="http://lua.mk" rel="noreferrer" target="_blank">lua.mk</a><br>
> @@ -4,15 +4,19 @@<br>
>  #<br>
>  ################################################################################<br>
>  <br>
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)<br>
> +LUA_VERSION = 5.4.0<br>
> +else<br>
>  ifeq ($(BR2_PACKAGE_LUA_5_3),y)<br>
<br>
else ifeq<br>
<br>
on one line...<br>
<br>
>  LUA_VERSION = 5.3.5<br>
>  else<br>
>  LUA_VERSION = 5.1.5<br>
>  endif<br>
> +endif<br>
<br>
... as it avoids the need for that additional endif.<br>
<br>
>  LUA_SITE = <a href="http://www.lua.org/ftp" rel="noreferrer" target="_blank">http://www.lua.org/ftp</a><br>
>  LUA_INSTALL_STAGING = YES<br>
>  LUA_LICENSE = MIT<br>
> -ifeq ($(BR2_PACKAGE_LUA_5_3),y)<br>
> +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y)<br>
>  LUA_LICENSE_FILES = doc/readme.html<br>
>  else<br>
>  LUA_LICENSE_FILES = COPYRIGHT<br>
> @@ -22,6 +26,10 @@ LUA_PROVIDES = luainterpreter<br>
>  <br>
>  LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX<br>
>  <br>
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)<br>
> +LUA_CFLAGS += -DLUA_COMPAT_5_3<br>
> +endif<br>
> +<br>
>  ifeq ($(BR2_PACKAGE_LUA_5_3),y)<br>
<br>
This could be changed to:<br>
<br>
else ifeq ($(BR2_PACKAGE_LUA_5_3),y)<br>
<br>
> diff --git a/package/<a href="http://pkg-luarocks.mk" rel="noreferrer" target="_blank">pkg-luarocks.mk</a> b/package/<a href="http://pkg-luarocks.mk" rel="noreferrer" target="_blank">pkg-luarocks.mk</a><br>
> index 603c0851b..be85563ba 100644<br>
> --- a/package/<a href="http://pkg-luarocks.mk" rel="noreferrer" target="_blank">pkg-luarocks.mk</a><br>
> +++ b/package/<a href="http://pkg-luarocks.mk" rel="noreferrer" target="_blank">pkg-luarocks.mk</a><br>
> @@ -20,9 +20,9 @@<br>
>  LUAROCKS_RUN_CMD = $(HOST_DIR)/bin/luarocks<br>
>  LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC<br>
>  HOST_LUAROCKS_CFLAGS = $(HOST_CFLAGS) -fPIC<br>
> -ifeq ($(BR2_PACKAGE_LUA_5_3),y)<br>
> -LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2<br>
> -HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2<br>
<br>
I don't understand why this is being dropped. Could you clarify ?<br></blockquote><div><br></div><div>good catch!</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)<br>
> +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3<br>
> +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3<br>
>  endif<br>
<br>
Thanks!<br>
<br>
Thomas<br>
-- <br>
Thomas Petazzoni, CTO, Bootlin<br>
Embedded Linux and Kernel engineering<br>
<a href="https://bootlin.com" rel="noreferrer" target="_blank">https://bootlin.com</a><br>
_______________________________________________<br>
buildroot mailing list<br>
<a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br>
<a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/mailman/listinfo/buildroot</a><br>
</blockquote></div></div>