rpm/haproxy
SHA256
1
0
Fork 0
forked from pool/haproxy
Code Pull Requests Activity

Accepting request 868970 from server:http

Browse Source 
- Add lua54.patch to fix building with lua 5.4

OBS-URL: https://build.opensuse.org/request/show/868970
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=97
This commit is contained in:
Dominique Leuenberger 2021-02-04 19:23:49 +00:00 committed by Git OBS Bridge
commit c54990bb01
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
haproxy.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 27 16:19:26 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
- Add lua54.patch to fix building with lua 5.4
-------------------------------------------------------------------
Wed Jan 13 16:02:43 UTC 2021 - mrueckert@suse.de

2
haproxy.spec
View File

@ -101,6 +101,7 @@ Source5: haproxy-user.conf
Patch1: haproxy-1.6.0_config_haproxy_user.patch
Patch2: haproxy-1.6.0-makefile_lib.patch
Patch3: haproxy-1.6.0-sec-options.patch
Patch4: lua54.patch
#
Source98: series
Source99: haproxy-rpmlintrc
@ -136,6 +137,7 @@ the most work done from every CPU cycle.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
make %{?_smp_mflags} \

41
lua54.patch Normal file
View File

@ -0,0 +1,41 @@
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@
# LUA_LIB : force the lib path to lua
# LUA_INC : force the include path to lua
# LUA_LIB_NAME : force the lib name (or automatically evaluated, by order of
-# priority : lua5.3, lua53, lua).
+# priority : lua5.4, lua54, lua5.3, lua53, lua).
# IGNOREGIT : ignore GIT commit versions if set.
# VERSION : force haproxy version reporting.
# SUBVERS : add a sub-version (eg: platform, model, ...).
@@ -579,11 +579,11 @@
LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) $(if $(LUA_LIB),-L$(LUA_LIB))
ifeq ($(LUA_LIB_NAME),)
# Try to automatically detect the Lua library
-LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS))))
+LUA_LIB_NAME := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS))))
ifeq ($(LUA_LIB_NAME),)
-$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME=<name> (where <name> can be lua5.3, lua53, lua, ...))
+$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME=<name> (where <name> can be lua5.4, lua54, lua5.3, lua53, lua, ...))
endif
-LUA_INC := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))
+LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))
ifneq ($(LUA_INC),)
OPTIONS_CFLAGS += -I$(LUA_INC)
endif
--- a/INSTALL
+++ b/INSTALL
@@ -295,9 +295,9 @@
advanced scripting capabilities. Only versions 5.3 and above are supported.
In order to enable Lua support, please specify "USE_LUA=1" on the command line.
Some systems provide this library under various names to avoid conflicts with
-previous versions. By default, HAProxy looks for "lua5.3", "lua53", "lua". If
-your system uses a different naming, you may need to set the library name in
-the "LUA_LIB_NAME" variable.
+previous versions. By default, HAProxy looks for "lua5.4", "lua54","lua5.3",
+"lua53","lua". If your system uses a different naming, you may need to set
+the library name in the "LUA_LIB_NAME" variable.
If Lua is not provided on your system, it can be very simply built locally. It
can be downloaded from https://www.lua.org/, extracted and built, for example :