luarocks, bump to version 3.13.0 (#13703)

fix path for the lua headers
This commit is contained in:
Schrijvers Luc
2026-02-03 10:15:37 +01:00
committed by GitHub
parent 9b4acec30e
commit 3264354bd1
2 changed files with 40 additions and 15 deletions

View File

@@ -6,11 +6,11 @@ COPYRIGHT="2007-2014 Kepler Project"
LICENSE="MIT" LICENSE="MIT"
REVISION="5" REVISION="5"
SOURCE_URI="https://luarocks.org/releases/luarocks-$portVersion.tar.gz" SOURCE_URI="https://luarocks.org/releases/luarocks-$portVersion.tar.gz"
CHECKSUM_SHA256="c3fb3d960dffb2b2fe9de7e3cb004dc4d0b34bb3d342578af84f84325c669102" CHECKSUM_SHA256="245bf6ec560c042cb8948e3d661189292587c5949104677f1eecddc54dbe7e37"
SOURCE_DIR="luarocks-$portVersion" SOURCE_DIR="luarocks-$portVersion"
PATCHES="luarocks-$portVersion.patchset" PATCHES="luarocks-$portVersion.patchset"
ARCHITECTURES="all" ARCHITECTURES="ALL"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES=" GLOBAL_WRITABLE_FILES="
@@ -55,7 +55,7 @@ BUILD()
--rocks-tree="$(finddir B_USER_NONPACKAGED_DIRECTORY)" \ --rocks-tree="$(finddir B_USER_NONPACKAGED_DIRECTORY)" \
--force-config --force-config
make make
for v in 5.3 5.2 5.1; do for v in 5.4 5.3 5.2 5.1; do
make LUA_VERSION=$v LUA=/bin/lua$v LUA_INCDIR="$sysIncDir/lua${v//./}" ./build/config-$v.lua make LUA_VERSION=$v LUA=/bin/lua$v LUA_INCDIR="$sysIncDir/lua${v//./}" ./build/config-$v.lua
done done
} }
@@ -63,7 +63,7 @@ BUILD()
INSTALL() INSTALL()
{ {
make bindir=$binDir install make bindir=$binDir install
for v in 5.3 5.2 5.1; do for v in 5.4 5.3 5.2 5.1; do
make LUA_VERSION=$v install-config make LUA_VERSION=$v install-config
done done
} }

View File

@@ -1,11 +1,11 @@
From 1698ff1c00fda00f2469bb1b9d8ef90b00e09d2d Mon Sep 17 00:00:00 2001 From 259fae2a1235103fd0ffd6d8dd0593a3be5c75b4 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com> From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 8 Jun 2024 17:47:03 +0200 Date: Sat, 8 Jun 2024 17:47:03 +0200
Subject: Set datarootdir + don't use hard links Subject: Set datarootdir + don't use hard links
diff --git a/GNUmakefile b/GNUmakefile diff --git a/GNUmakefile b/GNUmakefile
index dade806..66f7226 100644 index c938756..26581c3 100644
--- a/GNUmakefile --- a/GNUmakefile
+++ b/GNUmakefile +++ b/GNUmakefile
@@ -2,7 +2,7 @@ MAKEFLAGS += --jobs=1 @@ -2,7 +2,7 @@ MAKEFLAGS += --jobs=1
@@ -18,7 +18,7 @@ index dade806..66f7226 100644
INSTALL = install INSTALL = install
INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DATA = $(INSTALL) -m 644
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 9cfd9dd..d420026 100644 index 1c380e1..7dbdba6 100644
--- a/src/luarocks/core/cfg.lua --- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua
@@ -242,7 +242,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) @@ -242,7 +242,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
@@ -31,17 +31,17 @@ index 9cfd9dd..d420026 100644
RM = "rm", RM = "rm",
FIND = "find", FIND = "find",
-- --
2.45.2 2.52.0
From d4411a95d712af61a4cb4f210f90b099a878c4fa Mon Sep 17 00:00:00 2001 From 9cfe3fad5f9f4d317846a2a67f478809d5406737 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com> From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 28 Jun 2024 15:38:35 +0200 Date: Fri, 28 Jun 2024 15:38:35 +0200
Subject: More fixes for share/data directory (found in check on 32bit) Subject: More fixes for share/data directory (found in check on 32bit)
diff --git a/spec/init_spec.lua b/spec/init_spec.lua diff --git a/spec/init_spec.lua b/spec/init_spec.lua
index 88bd23a..71322b3 100644 index 6cc0dd9..468aed3 100644
--- a/spec/init_spec.lua --- a/spec/init_spec.lua
+++ b/spec/init_spec.lua +++ b/spec/init_spec.lua
@@ -212,7 +212,7 @@ describe("luarocks init #integration", function() @@ -212,7 +212,7 @@ describe("luarocks init #integration", function()
@@ -54,7 +54,7 @@ index 88bd23a..71322b3 100644
os.remove(rockspec_filename) os.remove(rockspec_filename)
os.remove("my_dependency-1.0-1.rockspec") os.remove("my_dependency-1.0-1.rockspec")
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index d420026..f931bf0 100644 index 7dbdba6..62c1561 100644
--- a/src/luarocks/core/cfg.lua --- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua
@@ -67,7 +67,7 @@ local function detect_sysconfdir() @@ -67,7 +67,7 @@ local function detect_sysconfdir()
@@ -76,17 +76,17 @@ index d420026..f931bf0 100644
rocks_subdir = dir.path("lib", "luarocks", "rocks-"..lua_version), rocks_subdir = dir.path("lib", "luarocks", "rocks-"..lua_version),
-- --
2.45.2 2.52.0
From 8474a1d43446a3d37ea55956abd89f23e98fb9f3 Mon Sep 17 00:00:00 2001 From f943285556cf9da1efa562bd241471e31ec8692b Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com> From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 8 Jul 2024 11:50:43 +0200 Date: Mon, 8 Jul 2024 11:50:43 +0200
Subject: Adjust paths for headers search Subject: Adjust paths for headers search
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index f931bf0..33326f1 100644 index 62c1561..3de0f00 100644
--- a/src/luarocks/core/cfg.lua --- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua
@@ -272,12 +272,12 @@ local function make_defaults(lua_version, target_cpu, platforms, home) @@ -272,12 +272,12 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
@@ -114,5 +114,30 @@ index f931bf0..33326f1 100644
defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2"
-- we pass -fPIC via CFLAGS because of old Makefile-based Lua projects -- we pass -fPIC via CFLAGS because of old Makefile-based Lua projects
-- --
2.45.2 2.52.0
From 0301731e0bcaa748bb8ea40674c804d824a77b93 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Tue, 3 Feb 2026 08:05:29 +0100
Subject: v3.13.0 rockspec is broken
https://github.com/luarocks/luarocks/issues/1851
diff --git a/luarocks-3.13.0-1.rockspec b/luarocks-3.13.0-1.rockspec
index 012b1da..106eed9 100644
--- a/luarocks-3.13.0-1.rockspec
+++ b/luarocks-3.13.0-1.rockspec
@@ -3,8 +3,7 @@ package = "luarocks"
version = "3.13.0-1"
source = {
url = "git+https://github.com/luarocks/luarocks",
- tag = "v3.13.0"
- tag = "v3.12.2",
+ tag = "v3.13.0",
}
description = {
summary = "A package manager for Lua modules.",
--
2.52.0