[Buildroot] [PATCH 12/23] lua: rework post-patch hook usage

From: Florian Fainelli via buildroot <buildroot@buildroot.org>
To: buildroot@buildroot.org
Cc: "Gary Bisson" <bisson.gary@gmail.com>,
	"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
	"Petr Vorel" <petr.vorel@gmail.com>,
	"Spenser Gilliland" <spenser@gillilanding.com>,
	"Francois Perrad" <fperrad@gmail.com>,
	"Florian Fainelli" <florian.fainelli@broadcom.com>,
	"Maxime Chevallier" <maxime.chevallier@bootlin.com>,
	"Francois Perrad" <francois.perrad.86@gmail.com>,
	"Arnout Vandecappelle" <arnout@rnout.be>,
	"Luca Ceresoli" <luca.ceresoli@bootlin.com>,
	"Thomas Perale" <thomas.perale@mind.be>,
	"Eric Le Bihan" <eric.le.bihan.dev@free.fr>,
	"Mahyar Koshkouei" <mahyar.koshkouei@gmail.com>,
	"Yann E. MORIN" <yann.morin.1998@free.fr>,
	"Romain Naour" <romain.naour@gmail.com>,
	"Pascal de Bruijn" <p.debruijn@unilogic.nl>,
	"Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>,
	"Jérôme Pouiller" <jezz@sysmic.org>,
	"Bernd Kuhls" <bernd@kuhls.net>,
	"Refik Tuzakli" <tuzakli.refik@gmail.com>,
	"Giulio Benetti" <giulio.benetti@benettiengineering.com>
Subject: [Buildroot] [PATCH 12/23] lua: rework post-patch hook usage
Date: Fri, 23 Oct 2026 14:51:27 -0700	[thread overview]
Message-ID: <20261023215138.2301146-6-florian.fainelli@broadcom.com> (raw)
In-Reply-To: <20261023215138.2301146-1-florian.fainelli@broadcom.com>

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

WIP: YEM: try to see if we can make that a post-configure hook

In preparation for the introduction of out-of-tree package build, it
is important that we don't do different things in the patch hooks for
the target and host variant of a given package, because the source
tree will be shared between the target and host builds.

For lua, the post patch hook was modifying luaconf.h before the build
to get a 32 bits Lua build. However, passing just -DLUA_32BITS like we
do for other Lua compile time options is not sufficient since
LUA_32BITS should also be defined in the installed luaconf.h so that
other packages linking against lua get this defined as well. So, this
patch changes the post-patch hook to passing -DLUA_32BITS in
LUA_CFLAGS *and* changing the installed luaconf.h in a
post-install-staging hook.

Cc: Francois Perrad <fperrad@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
(cherry picked from commit 827ed461ba2b00acfebcbd01e53d93a148594833)
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
 package/lua/lua.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 6dbdc950021b..92910f8fe746 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -66,11 +66,16 @@ endif
 endif
 
 ifeq ($(BR2_PACKAGE_LUA_32BITS),y)
+# We adjust the CFLAGS for the build of Lua itself, and then the
+# installed luaconf.h so that package using Lua also see LUA_32BITS
+# defined.
+LUA_CFLAGS += -DLUA_32BITS
 define LUA_32BITS_LUACONF
-	$(SED) 's/\/\* #define LUA_32BITS \*\//#define LUA_32BITS/' $(@D)/src/luaconf.h
+	$(SED) 's/\/\* #define LUA_32BITS \*\//#define LUA_32BITS/' \
+		$(STAGING_DIR)/usr/include/luaconf.h
 endef
 
-LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF
+LUA_POST_INSTALL_STAGING_HOOKS += LUA_32BITS_LUACONF
 endif
 
 define HOST_LUA_LUACONF
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
