[PR PATCH] lua cross

[PR PATCH] lua cross

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages lua-cross
https://github.com/void-linux/void-packages/pull/53804

lua cross
- **lua51-luasocket: don't taint masterdir**
- **lua54-linenoise: fix cross**
- **lua53-luautf8: fix cross**
- **lua52-compat53: fix cross**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53804.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua-cross-53804.patch --]
[-- Type: text/x-diff, Size: 3796 bytes --]

From 7071bf998c38f1e3df9293e306b6b0ad975f4de0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Jan 2025 14:06:29 +0100
Subject: [PATCH 1/4] lua51-luasocket: don't taint masterdir

---
 srcpkgs/lua51-luasocket/template | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/srcpkgs/lua51-luasocket/template b/srcpkgs/lua51-luasocket/template
index d62a998ae34121..e74a0518d4e14d 100644
--- a/srcpkgs/lua51-luasocket/template
+++ b/srcpkgs/lua51-luasocket/template
@@ -19,17 +19,10 @@ for _lua_version in $_lua_versions; do
 	makedepends+=" ${_lua_version/./}-devel"
 done
 
-#if [[ CROSS_BUILD ]]; then
-#	for _lua_version in $_lua_versions; do
-#		hostmakedepends+=" ${_lua_version/./}-devel"
-#	done
-#fi
-
 _rockname=${pkgname#lua51-}
 _rocksrel=1
 _package() {
-	luarocks config --lua-version="$1" variables.LUA_INCDIR "${XBPS_CROSS_BASE}/usr/include/lua$1"
-	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
+	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" LUA_INCDIR="${XBPS_CROSS_BASE}/usr/include/lua$1" \
 		make --deps-mode=none --no-manifest "rockspecs/${_rockname}-${version}-${_rocksrel}.rockspec"
 }
 

From d157d44130e984a7668c7055a17db3ec463f1dea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Jan 2025 14:06:42 +0100
Subject: [PATCH 2/4] lua54-linenoise: fix cross

---
 srcpkgs/lua54-linenoise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-linenoise/template b/srcpkgs/lua54-linenoise/template
index 8505d1c3334ec5..828eb0a88a131b 100644
--- a/srcpkgs/lua54-linenoise/template
+++ b/srcpkgs/lua54-linenoise/template
@@ -15,7 +15,7 @@ checksum=cc1cdb4047edd056a10dcdeec853dbaf5088e2202941d579e4592584d733f09c
 _rockname=${pkgname#lua54-}
 _rocksrel=1
 _package() {
-	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
+	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" LUA_INCDIR="${XBPS_CROSS_BASE}/usr/include/lua$1" \
 		make --deps-mode=none --no-manifest "${_rockname}-${version}-${_rocksrel}.rockspec"
 }
 

From 467f4162c414a561ac68712047fae2298a7d0d60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Jan 2025 14:06:56 +0100
Subject: [PATCH 3/4] lua53-luautf8: fix cross

---
 srcpkgs/lua54-luautf8/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luautf8/template b/srcpkgs/lua54-luautf8/template
index 909d6b9e57f106..426db82c719118 100644
--- a/srcpkgs/lua54-luautf8/template
+++ b/srcpkgs/lua54-luautf8/template
@@ -21,7 +21,7 @@ done
 _rockname=${pkgname#lua54-}
 _rocksrel=1
 _package() {
-	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
+	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" LUA_INCDIR="${XBPS_CROSS_BASE}/usr/include/lua$1" \
 		make --deps-mode=none --no-manifest "rockspecs/${_rockname}-${version}-${_rocksrel}.rockspec"
 }
 

From 4b81c1e53aff8fb5e95270b8759db5cda19cada4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Jan 2025 14:07:48 +0100
Subject: [PATCH 4/4] lua52-compat53: fix cross

---
 srcpkgs/lua52-compat53/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua52-compat53/template b/srcpkgs/lua52-compat53/template
index 9c9386654384de..afaccd954bc265 100644
--- a/srcpkgs/lua52-compat53/template
+++ b/srcpkgs/lua52-compat53/template
@@ -15,7 +15,7 @@ checksum=f5dc30e7b1fda856ee4d392be457642c1f0c259264a9b9bfbcb680302ce88fc2
 _rockname=${pkgname#lua52-}
 _rocksrel=1
 _package() {
-	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
+	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" LUA_INCDIR="${XBPS_CROSS_BASE}/usr/include/lua$1" \
 		make --deps-mode=none --no-manifest "rockspecs/${_rockname}-${version}-${_rocksrel}.rockspec"
 }
 

Re: [PR PATCH] [Merged]: lua cross

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1208 bytes --]

There's a merged pull request on the void-packages repository

lua cross
https://github.com/void-linux/void-packages/pull/53804

Description:
- **lua51-luasocket: don't taint masterdir**
- **lua54-linenoise: fix cross**
- **lua53-luautf8: fix cross**
- **lua52-compat53: fix cross**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->