Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 01/11] lua: add 5.4.0 version
Date: Mon, 27 Jul 2020 16:00:38 +0200	[thread overview]
Message-ID: <20200727160038.6fcf446a@windsurf.home> (raw)
In-Reply-To: <20200702202230.1531929-2-francois.perrad@gadz.org>

Hello Fran?ois,

Most issues are small details, except the last one, which really needs
a reply from you.

On Thu,  2 Jul 2020 22:22:20 +0200
Francois Perrad <fperrad@gmail.com> wrote:

> diff --git a/package/lua/lua.mk b/package/lua/lua.mk
> index ce75af6b0..0b6d2c1dc 100644
> --- a/package/lua/lua.mk
> +++ b/package/lua/lua.mk
> @@ -4,15 +4,19 @@
>  #
>  ################################################################################
>  
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> +LUA_VERSION = 5.4.0
> +else
>  ifeq ($(BR2_PACKAGE_LUA_5_3),y)

else ifeq

on one line...

>  LUA_VERSION = 5.3.5
>  else
>  LUA_VERSION = 5.1.5
>  endif
> +endif

... as it avoids the need for that additional endif.

>  LUA_SITE = http://www.lua.org/ftp
>  LUA_INSTALL_STAGING = YES
>  LUA_LICENSE = MIT
> -ifeq ($(BR2_PACKAGE_LUA_5_3),y)
> +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y)
>  LUA_LICENSE_FILES = doc/readme.html
>  else
>  LUA_LICENSE_FILES = COPYRIGHT
> @@ -22,6 +26,10 @@ LUA_PROVIDES = luainterpreter
>  
>  LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
>  
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> +LUA_CFLAGS += -DLUA_COMPAT_5_3
> +endif
> +
>  ifeq ($(BR2_PACKAGE_LUA_5_3),y)

This could be changed to:

else ifeq ($(BR2_PACKAGE_LUA_5_3),y)

> diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
> index 603c0851b..be85563ba 100644
> --- a/package/pkg-luarocks.mk
> +++ b/package/pkg-luarocks.mk
> @@ -20,9 +20,9 @@
>  LUAROCKS_RUN_CMD = $(HOST_DIR)/bin/luarocks
>  LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
>  HOST_LUAROCKS_CFLAGS = $(HOST_CFLAGS) -fPIC
> -ifeq ($(BR2_PACKAGE_LUA_5_3),y)
> -LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
> -HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2

I don't understand why this is being dropped. Could you clarify ?

> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
> +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
>  endif

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

  reply	other threads:[~2020-07-27 14:00 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 01/11] lua: add 5.4.0 version Francois Perrad
2020-07-27 14:00   ` Thomas Petazzoni [this message]
2020-07-27 16:59     ` François Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 02/11] package/luabitop: unsupport of Lua 5.4, as 5.3 Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 03/11] package/lua-compat53: " Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 04/11] package/prosody: " Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 05/11] package/lua-messagepack: add support of Lua 5.4 Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 06/11] package/luaossl: " Francois Perrad
2020-07-10 15:31   ` François Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 07/11] package/easybus: temporarily disabled with " Francois Perrad
2020-07-27 14:04   ` Thomas Petazzoni
2020-07-02 20:22 ` [Buildroot] [PATCH 08/11] package/lua-cqueues: " Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 09/11] package/lua-flu: " Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 10/11] package/lua-sdl2: " Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 11/11] package/luv: " Francois Perrad
2020-07-25 20:42 ` [Buildroot] [PATCH 00/11] " Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200727160038.6fcf446a@windsurf.home \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox