[PR PATCH] [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[PR PATCH] [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages LuaJIT
https://github.com/void-linux/void-packages/pull/20499

[WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir
Just a stupid workaround for musl, but I haven't tested the resulting binary yet. So don't merge except you tested it :)

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

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

From 463fe264c9b4a1ec3e11d29e86bcace7d4615d59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Mar 2020 17:21:18 +0200
Subject: [PATCH] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl
 masterdir

---
 srcpkgs/LuaJIT/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 7e13bc38afe..4538c884b96 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -18,6 +18,9 @@ if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
 	if [ "$XBPS_MACHINE" = "x86_64" ]; then
 		hostmakedepends+=" gcc-multilib"
 		_cross_cc="cc -m32"
+	elif [ "$XBPS_MACHINE" = "x86_64-musl" ]; then
+		hostmakedepends+=" cross-i686-linux-musl"
+		_cross_cc="i686-linux-musl-gcc -static"
 	else
 		broken="Host and target wordsize must match"
 	fi

Re: [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/20499#issuecomment-606975506

Comment:
Hello from IRC. I'm going to try this patch out. Shouldn't you probably do a revision bump as well? 

Re: [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/20499#issuecomment-606988128

Comment:
no, it's not built right now so it'll get picked up

Re: [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/20499#issuecomment-606988128

Comment:
no, it's not built right now so it'll get picked up

Also, you can simplify this, just do the i686-musl toolchain trick for all x86_64

Re: [PR PATCH] [Updated] [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages LuaJIT
https://github.com/void-linux/void-packages/pull/20499

[WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir
Just a stupid workaround for musl, but I haven't tested the resulting binary yet. So don't merge except you tested it :)

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

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

From b739b93fc8efc88b2aa52c3ed09d3613aac8c55f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Mar 2020 17:21:18 +0200
Subject: [PATCH] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl
 masterdir

---
 srcpkgs/LuaJIT/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 7e13bc38afe..7c7641ef891 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -15,9 +15,9 @@ checksum=1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3
 
 _cross_cc="cc"
 if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
-	if [ "$XBPS_MACHINE" = "x86_64" ]; then
-		hostmakedepends+=" gcc-multilib"
-		_cross_cc="cc -m32"
+	if [ "${XBPS_MACHINE/-musl/}" = "x86_64" ]; then
+		hostmakedepends+=" cross-i686-linux-musl"
+		_cross_cc="i686-linux-musl-gcc -static"
 	else
 		broken="Host and target wordsize must match"
 	fi

Re: [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/20499#issuecomment-609751266

Comment:
@ericonr Did you find time so far to test this?

Re: [PR PATCH] [Merged]: [WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir

[Johnnynator]

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

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

[WIP] LuaJIT: allow cross compiling to 32bit systems in x86_64-musl masterdir
https://github.com/void-linux/void-packages/pull/20499

Description:
Just a stupid workaround for musl, but I haven't tested the resulting binary yet. So don't merge except you tested it :)