[Dnsmasq-discuss] [PATCH] Easier custom lua version

[Petr Menšík]

Hello!




Cheers,
Petr

--
Petr Menšík
Software Engineer, RHEL
Red Hat, https://www.redhat.com/
PGP: DFCF908DB7C87E8E529925BC4931CA5B6C9FC5CB


From 2de2259472d64d36221bd7ab0efe03f4501f8620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemen...@redhat.com>
Date: Wed, 24 Jan 2024 11:28:38 +0100
Subject: [PATCH] Make lua version more easy to customize

If distribution making lua-enabled binary does not use default lua5.4,
make it possible to use make LUA=lua5.1 or make LUA=lua.

Fedora provides just lua-devel with pkg-config lua, this change would
make it easier to build it.
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4c5401e..7a6aac6 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ LIBS          =
 
 PKG_CONFIG = pkg-config
 INSTALL    = install
+LUA        = lua5.4
 MSGMERGE   = msgmerge
 MSGFMT     = msgfmt
 XGETTEXT   = xgettext
@@ -60,8 +61,8 @@ idn2_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI
 idn2_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
 ct_cflags =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
 ct_libs =       `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
-lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.4` 
-lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.4` 
+lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags $(LUA)`
+lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs $(LUA)`
 nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC     $(PKG_CONFIG) --cflags 'nettle hogweed' \
                                                         HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \
                                                         HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle`
-- 
2.43.0

I have just noticed bump of lua in Makefile. A bit problem is our Fedora's lua-devel does not provide versioned pkg-config lua5.4. Instead it provides just lua. Attached change makes it simple to customize used lua pkg-config to overcome that limitation. Default stays the same, but customization can be done just by make COPTS='-DHAVE_LUASCRIPT' LUA=lua.

OpenPGP_0x4931CA5B6C9FC5CB.asc
Description: OpenPGP public key

OpenPGP_signature.asc
Description: OpenPGP digital signature

_______________________________________________
Dnsmasq-discuss mailing list
Dnsmasq-discuss@lists.thekelleys.org.uk
https://lists.thekelleys.org.uk/cgi-bin/mailman/listinfo/dnsmasq-discuss