From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 2 May 2017 09:52:31 +0000 (+0200)
Subject: fix compiling with luajit-2.1.0-beta3
X-Git-Tag: v1.3.0~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ec0c55df1128f6425bea8fa2f60bf85dfeded9d;p=thirdparty%2Fknot-resolver.git

fix compiling with luajit-2.1.0-beta3

It added a function from lua > 5.1, without bumping the language
version.  The changelog seems safe and Deckard still passes.
---

diff --git a/daemon/bindings.h b/daemon/bindings.h
index 2c2c50483..554077809 100644
--- a/daemon/bindings.h
+++ b/daemon/bindings.h
@@ -34,6 +34,9 @@
 	lua_objlen((L), (obj))
 #define register_lib(L, name, lib) \
 	luaL_openlib((L), (name), (lib), 0)
+#endif
+
+#if !LUA_HAS_SETFUNCS
 /* Adapted from Lua 5.2.0 */
 static inline void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
   luaL_checkstack(L, nup+1, "too many upvalues");
diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index 70a149053..ac692f775 100644
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -25,9 +25,13 @@ endif
 bindings-install: $(kresd_DIST) $(DESTDIR)$(MODULEDIR)
 	$(INSTALL) -m 0644 $(kresd_DIST) $(DESTDIR)$(MODULEDIR)
 
+LUA_HAS_SETFUNCS := \
+	$(shell pkg-config luajit --atleast-version=2.1.0-beta3 && echo 1 || echo 0)
+
 kresd_CFLAGS := -fPIE \
 		-Dlibknot_SONAME=\"$(libknot_SONAME)\" \
-		-Dlibzscanner_SONAME=\"$(libzscanner_SONAME)\"
+		-Dlibzscanner_SONAME=\"$(libzscanner_SONAME)\" \
+		-DLUA_HAS_SETFUNCS="$(LUA_HAS_SETFUNCS)"
 kresd_DEPEND := $(libkres) $(contrib)
 kresd_LIBS := $(libkres_TARGET) $(contrib_TARGET) $(libknot_LIBS) \
               $(libzscanner_LIBS) $(libdnssec_LIBS) $(libuv_LIBS) $(lua_LIBS) \