[PR PATCH] lua54-luarepl: fix cross compiled binary

[PR PATCH] lua54-luarepl: fix cross compiled binary

[AnInternetTroll]

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

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

https://github.com/AnInternetTroll/void-packages user/luca/lua-repl
https://github.com/void-linux/void-packages/pull/53811

lua54-luarepl: fix cross compiled binary
When cross compiling the path in /usr/bin/repl.lua contains the target
arch in the destdir path, which must be replaced differently than the
others.

Aside from that, added lua version to the package and sub packages
descriptions, as well as switched to vsed to catch this next time. And
move vlicense in _package.

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuilt)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/lua-repl-53811.patch --]
[-- Type: text/x-diff, Size: 2589 bytes --]

From 2a4a3d8be6d8b02fe186e78887c0bbd71927c8c6 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Thu, 2 Jan 2025 15:41:55 +0100
Subject: [PATCH] lua54-luarepl: fix cross compiled binary

When cross compiling the path in /usr/bin/repl.lua contains the target
arch in the destdir path, which must be replaced differently than the
others.

Aside from that, added lua version to the package and sub packages
descriptions, as well as switched to vsed to catch this next time. And
move vlicense in _package.
---
 srcpkgs/lua54-luarepl/template | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/lua54-luarepl/template b/srcpkgs/lua54-luarepl/template
index 643516e90e62e6..072de6fa2469b9 100644
--- a/srcpkgs/lua54-luarepl/template
+++ b/srcpkgs/lua54-luarepl/template
@@ -1,11 +1,12 @@
 # Template file for 'lua54-luarepl'
 pkgname=lua54-luarepl
 version=0.10
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="lua51 lua52 lua53 lua54 luarocks-lua54"
 depends="lua54"
-short_desc="Reusable REPL component for Lua, written in Lua"
+_desc="Reusable REPL component for Lua, written in Lua"
+short_desc="${_desc} (5.4.x)"
 maintainer="Luciogi <githubvoidlinux.supremacy429@passinbox.com>"
 license="MIT"
 homepage="https://github.com/hoelzro/lua-repl"
@@ -17,37 +18,40 @@ _rocksrel=1
 _package() {
 	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
 		make --deps-mode=none --no-manifest "${_rockname}-${version}-${_rocksrel}.rockspec"
-		echo /destdir/${pkgname}-${version}
-		sed -i -e "s|/destdir/${pkgname}-${version}||" "${PKGDESTDIR}/usr/bin/rep.lua"
+		if [ "$CROSS_BUILD" ]; then
+			vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|/destdir/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}||g"
+		else
+			vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|/destdir/${pkgname}-${version}||g"
+		fi
 		mv "${PKGDESTDIR}/usr/bin/rep.lua" "${PKGDESTDIR}/usr/bin/rep.lua${1/./}"
+		vlicense COPYING
 }
 
 do_install() {
 	_package 5.4
-	sed -i -e "s|lua5\.3|lua5\.4|" "${PKGDESTDIR}/usr/bin/rep.lua54"
-	vlicense COPYING
+	vsed -i "${PKGDESTDIR}/usr/bin/rep.lua54" -e "s|lua5\.3|lua5\.4|"
 }
 
 lua53-luarepl_package() {
 	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
 	pkg_install() {
 		_package 5.3
-		vlicense COPYING
 	}
 }
 
 lua52-luarepl_package() {
 	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
 	pkg_install() {
 		_package 5.2
-		vlicense COPYING
 	}
 }
 
 lua51-luarepl_package() {
 	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
 	pkg_install() {
 		_package 5.1
-		vlicense COPYING
 	}
 }

Re: [PR REVIEW] lua54-luarepl: fix cross compiled binary

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/53811#discussion_r1903104628

Comment:
```suggestion
		vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|${PKGDESTDIR}||g"
```

Re: [PR PATCH] [Updated] lua54-luarepl: fix cross compiled binary

[sgn]

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/lua-repl
https://github.com/void-linux/void-packages/pull/53811

lua54-luarepl: fix cross compiled binary
When cross compiling the path in /usr/bin/repl.lua contains the target
arch in the destdir path, which must be replaced differently than the
others.

Aside from that, added lua version to the package and sub packages
descriptions, as well as switched to vsed to catch this next time. And
move vlicense in _package.

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuilt)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/lua-repl-53811.patch --]
[-- Type: text/x-diff, Size: 3738 bytes --]

From 2a4a3d8be6d8b02fe186e78887c0bbd71927c8c6 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Thu, 2 Jan 2025 15:41:55 +0100
Subject: [PATCH 1/2] lua54-luarepl: fix cross compiled binary

When cross compiling the path in /usr/bin/repl.lua contains the target
arch in the destdir path, which must be replaced differently than the
others.

Aside from that, added lua version to the package and sub packages
descriptions, as well as switched to vsed to catch this next time. And
move vlicense in _package.
---
 srcpkgs/lua54-luarepl/template | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/lua54-luarepl/template b/srcpkgs/lua54-luarepl/template
index 643516e90e62e6..072de6fa2469b9 100644
--- a/srcpkgs/lua54-luarepl/template
+++ b/srcpkgs/lua54-luarepl/template
@@ -1,11 +1,12 @@
 # Template file for 'lua54-luarepl'
 pkgname=lua54-luarepl
 version=0.10
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="lua51 lua52 lua53 lua54 luarocks-lua54"
 depends="lua54"
-short_desc="Reusable REPL component for Lua, written in Lua"
+_desc="Reusable REPL component for Lua, written in Lua"
+short_desc="${_desc} (5.4.x)"
 maintainer="Luciogi <githubvoidlinux.supremacy429@passinbox.com>"
 license="MIT"
 homepage="https://github.com/hoelzro/lua-repl"
@@ -17,37 +18,40 @@ _rocksrel=1
 _package() {
 	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
 		make --deps-mode=none --no-manifest "${_rockname}-${version}-${_rocksrel}.rockspec"
-		echo /destdir/${pkgname}-${version}
-		sed -i -e "s|/destdir/${pkgname}-${version}||" "${PKGDESTDIR}/usr/bin/rep.lua"
+		if [ "$CROSS_BUILD" ]; then
+			vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|/destdir/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}||g"
+		else
+			vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|/destdir/${pkgname}-${version}||g"
+		fi
 		mv "${PKGDESTDIR}/usr/bin/rep.lua" "${PKGDESTDIR}/usr/bin/rep.lua${1/./}"
+		vlicense COPYING
 }
 
 do_install() {
 	_package 5.4
-	sed -i -e "s|lua5\.3|lua5\.4|" "${PKGDESTDIR}/usr/bin/rep.lua54"
-	vlicense COPYING
+	vsed -i "${PKGDESTDIR}/usr/bin/rep.lua54" -e "s|lua5\.3|lua5\.4|"
 }
 
 lua53-luarepl_package() {
 	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
 	pkg_install() {
 		_package 5.3
-		vlicense COPYING
 	}
 }
 
 lua52-luarepl_package() {
 	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
 	pkg_install() {
 		_package 5.2
-		vlicense COPYING
 	}
 }
 
 lua51-luarepl_package() {
 	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
 	pkg_install() {
 		_package 5.1
-		vlicense COPYING
 	}
 }

From 98e7717c7b783d25f646148469a2feb8bae6ccc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <sgn.danh@gmail.com>
Date: Sat, 4 Jan 2025 21:04:23 +0700
Subject: [PATCH 2/2] Update srcpkgs/lua54-luarepl/template

---
 srcpkgs/lua54-luarepl/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/lua54-luarepl/template b/srcpkgs/lua54-luarepl/template
index 072de6fa2469b9..b806b77c8b307b 100644
--- a/srcpkgs/lua54-luarepl/template
+++ b/srcpkgs/lua54-luarepl/template
@@ -18,11 +18,7 @@ _rocksrel=1
 _package() {
 	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
 		make --deps-mode=none --no-manifest "${_rockname}-${version}-${_rocksrel}.rockspec"
-		if [ "$CROSS_BUILD" ]; then
-			vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|/destdir/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}||g"
-		else
-			vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|/destdir/${pkgname}-${version}||g"
-		fi
+		vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|${PKGDESTDIR}||g"
 		mv "${PKGDESTDIR}/usr/bin/rep.lua" "${PKGDESTDIR}/usr/bin/rep.lua${1/./}"
 		vlicense COPYING
 }

Re: [PR PATCH] [Updated] lua54-luarepl: fix cross compiled binary

[AnInternetTroll]

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/lua-repl
https://github.com/void-linux/void-packages/pull/53811

lua54-luarepl: fix cross compiled binary
When cross compiling the path in /usr/bin/repl.lua contains the target
arch in the destdir path, which must be replaced differently than the
others.

Aside from that, added lua version to the package and sub packages
descriptions, as well as switched to vsed to catch this next time. And
move vlicense in _package.

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuilt)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/lua-repl-53811.patch --]
[-- Type: text/x-diff, Size: 2581 bytes --]

From e0c72ec0d6d064b4f5c0e79f9eddfe6a01909aa1 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Thu, 2 Jan 2025 15:41:55 +0100
Subject: [PATCH] lua54-luarepl: fix cross compiled binary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When cross compiling the path in /usr/bin/repl.lua contains the target
arch in the destdir path, which must be replaced differently than the
others.

Aside from that, added lua version to the package and sub packages
descriptions, as well as switched to vsed to catch this next time. And
move vlicense in _package.

Co-Authored-By: Đoàn Trần Công Danh <sgn.danh@gmail.com>
---
 srcpkgs/lua54-luarepl/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/lua54-luarepl/template b/srcpkgs/lua54-luarepl/template
index 643516e90e62e6..3e276fec42b05f 100644
--- a/srcpkgs/lua54-luarepl/template
+++ b/srcpkgs/lua54-luarepl/template
@@ -1,11 +1,12 @@
 # Template file for 'lua54-luarepl'
 pkgname=lua54-luarepl
 version=0.10
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="lua51 lua52 lua53 lua54 luarocks-lua54"
 depends="lua54"
-short_desc="Reusable REPL component for Lua, written in Lua"
+_desc="Reusable REPL component for Lua, written in Lua"
+short_desc="${_desc} (5.4.x)"
 maintainer="Luciogi <githubvoidlinux.supremacy429@passinbox.com>"
 license="MIT"
 homepage="https://github.com/hoelzro/lua-repl"
@@ -17,37 +18,36 @@ _rocksrel=1
 _package() {
 	luarocks --lua-version="$1" --tree="${PKGDESTDIR}/usr/" \
 		make --deps-mode=none --no-manifest "${_rockname}-${version}-${_rocksrel}.rockspec"
-		echo /destdir/${pkgname}-${version}
-		sed -i -e "s|/destdir/${pkgname}-${version}||" "${PKGDESTDIR}/usr/bin/rep.lua"
+		vsed -i "${PKGDESTDIR}/usr/bin/rep.lua" -e "s|$(realpath "${PKGDESTDIR}")||g"
 		mv "${PKGDESTDIR}/usr/bin/rep.lua" "${PKGDESTDIR}/usr/bin/rep.lua${1/./}"
+		vlicense COPYING
 }
 
 do_install() {
 	_package 5.4
-	sed -i -e "s|lua5\.3|lua5\.4|" "${PKGDESTDIR}/usr/bin/rep.lua54"
-	vlicense COPYING
+	vsed -i "${PKGDESTDIR}/usr/bin/rep.lua54" -e "s|lua5\.3|lua5\.4|"
 }
 
 lua53-luarepl_package() {
 	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
 	pkg_install() {
 		_package 5.3
-		vlicense COPYING
 	}
 }
 
 lua52-luarepl_package() {
 	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
 	pkg_install() {
 		_package 5.2
-		vlicense COPYING
 	}
 }
 
 lua51-luarepl_package() {
 	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
 	pkg_install() {
 		_package 5.1
-		vlicense COPYING
 	}
 }

Re: [PR REVIEW] lua54-luarepl: fix cross compiled binary

[AnInternetTroll]

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

New review comment by AnInternetTroll on void-packages repository

https://github.com/void-linux/void-packages/pull/53811#discussion_r1903112026

Comment:
Thanks! I had to wrap the PKGDESTDIR variable in a `realpath` invocation to normalise it and remove the double slashes. But otherwise this is much simpler and readable! I'll update #53798 as well

Re: [PR PATCH] [Merged]: lua54-luarepl: fix cross compiled binary

[sgn]

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

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

lua54-luarepl: fix cross compiled binary
https://github.com/void-linux/void-packages/pull/53811

Description:
When cross compiling the path in /usr/bin/repl.lua contains the target
arch in the destdir path, which must be replaced differently than the
others.

Aside from that, added lua version to the package and sub packages
descriptions, as well as switched to vsed to catch this next time. And
move vlicense in _package.

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuilt)