!10 升级到最新的 luarock,同时解开和 openresty 的耦合

From: @shinwell_hu 
Reviewed-by: @myeuler 
Signed-off-by: @myeuler
This commit is contained in:
openeuler-ci-bot 2023-08-02 13:59:54 +00:00 committed by Gitee
commit d10326c705
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 13 additions and 59 deletions

View File

@ -1,39 +0,0 @@
From aed621d5db1d521404238a92f16b879180a469a2 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel@michel-slm.name>
Date: Wed, 27 Jan 2021 20:32:07 -0800
Subject: [PATCH] Dynamically detect libdir on Linux
Some Linux distributions (e.g. Fedora, CentOS) put 64-bit libraries
in `/usr/lib64` rather than `/usr/lib`. On such systems `luarocks`
should use `lib64` rather than `lib`.
Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
---
src/luarocks/core/cfg.lua | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 4ac5ee2..c7d2cb2 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -397,6 +397,18 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
defaults.variables.CFLAGS = defaults.variables.CFLAGS.." -fPIC"
end
defaults.web_browser = "xdg-open"
+ if platforms.linux then
+ -- inline code from fs/linux.lua since
+ -- luarocks.fs can't be required here
+ -- (circular dependencies)
+ local fd, _, code = io.open("/usr/lib64", "r")
+ if code ~= 2 then
+ defaults.lib_modules_path = "/lib64/lua/"..lua_version
+ end
+ if fd then
+ fd:close()
+ end
+ end
end
if platforms.cygwin then
--
2.29.2

Binary file not shown.

BIN
luarocks-3.9.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,31 +1,23 @@
# Use luajit within openresty, which is compatible with lua 5.1
%global lua_version 5.1
%global lua_version 5.4
%{!?lua_pkgdir: %global lua_pkgdir %{_datadir}/lua/%{lua_version}}
# Use luajit within openresty to build luarocks
%global openresty_prefix %{_usr}/local/openresty
%global openresty_luajit %{openresty_prefix}/luajit
Name: luarocks
Version: 3.5.0
Release: 3
Version: 3.9.2
Release: 1
Summary: A deployment and management system for Lua modules
License: MIT
URL: http://luarocks.org
Source0: http://luarocks.org/releases/luarocks-%{version}.tar.gz
Patch0: 0001-luarocks-3.5.0-dynamic_libdir.patch
BuildArch: noarch
BuildRequires: make
BuildRequires: openresty-openssl111-devel >= 1.1.1h-1
BuildRequires: openresty >= 1.19.3.1-1
BuildRequires: lua-devel
Requires: unzip
Requires: zip
Requires: openresty-openssl111 >= 1.1.1h-1
Requires: openresty >= 1.19.3.1-1
Requires: lua
%description
@ -45,12 +37,7 @@ repositories, and multiple local rocks trees.
%build
./configure \
--prefix=%{_prefix} \
%if 0%(test `uname -m` == "loongarch64" && echo 1)
--lua-version=%{lua_version}
%else
--lua-version=%{lua_version} \
--with-lua=%{openresty_luajit}
%endif
%make_build
%install
@ -59,8 +46,8 @@ repositories, and multiple local rocks trees.
mkdir -p %{buildroot}%{_prefix}/lib/luarocks/rocks-%{lua_version}
%check
# TODO - find how to run this without having to pre-download entire rocks tree
# ./test/run_tests.sh
# Need a offline regression test
# ./smoke_test.sh
%files
@ -75,6 +62,12 @@ mkdir -p %{buildroot}%{_prefix}/lib/luarocks/rocks-%{lua_version}
%changelog
* Tue Aug 1 2023 Xinwei Hu <shinwell_hu@openeuler.sh> - 3.9.2-1
- Decouple luarocks from openresty
- Upgrade to 3.9.2
. Improved connectivity resiliency
. A couple of minor feature additions
* Thu Jan 5 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 3.5.0-3
- fix build error for loongarch64