MD-1715: use compat-lua-5.1 header files for RHEL8 as LuaJIT uses the…

… lua 5.1 ABI
bbc · May 29, 2020 · cf0297e · cf0297e
1 parent f3889f2
commit cf0297e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pkg/Makefile.bidi b/pkg/Makefile.bidi
@@ -1,5 +1,5 @@
 PROJ=	liblpm
-LUA_VERSION := 5.3
+LUA_VERSION := 5.1
 
 all: rpm
 
@@ -16,6 +16,7 @@ specmunge:
 	git checkout SPECS/$(PROJ).spec
 	sed -i -e "/%define version/c\%define version $$(cat version.txt)" \
 		-e '/BuildRequires:.*make/a BuildRequires:  libasan\nBuildRequires:  libubsan' \
-		-e "/%define luaver/c\%define luaver $(LUA_VERSION)"  SPECS/$(PROJ).spec
+		-e "/%define luaver/c\%define luaver $(LUA_VERSION)" \
+		-e 's/lua >=/compat-lua >=/' -e 's/lua-devel >=/compat-lua-devel >=/' SPECS/$(PROJ).spec
 
 .PHONY: all rpm clean specmunge
diff --git a/pkg/SPECS/liblpm.spec b/pkg/SPECS/liblpm.spec
@@ -4,7 +4,7 @@
 
 Name:		liblpm
 Version:	%{version}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Longest Prefix Match (LPM) library
 Group:		System Environment/Libraries
 License:	BSD

diff --git a/src/lua/lpm_lua.c b/src/lua/lpm_lua.c
@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
+#include <lua-5.1/lua.h>
+#include <lua-5.1/lauxlib.h>
+#include <lua-5.1/lualib.h>
 
 #include "lpm.h"