[PR PATCH] ksh: fix cross build

[PR PATCH] ksh: fix cross build

[Gottox]

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

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

https://github.com/Gottox/void-packages ksh-cross
https://github.com/void-linux/void-packages/pull/29911

ksh: fix cross build


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

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

From 33c97b7878f1284cca44ddfb3bf5712e88bac707 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 Mar 2021 22:57:22 +0200
Subject: [PATCH] ksh: fix cross build

---
 srcpkgs/ksh/patches/fix-cross.diff | 9 +++++++++
 srcpkgs/ksh/template               | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ksh/patches/fix-cross.diff

diff --git a/srcpkgs/ksh/patches/fix-cross.diff b/srcpkgs/ksh/patches/fix-cross.diff
new file mode 100644
index 000000000000..dfefdaccb6b5
--- /dev/null
+++ b/srcpkgs/ksh/patches/fix-cross.diff
@@ -0,0 +1,9 @@
+--- scripts/libast_prereq.sh.orig	2021-03-31 22:45:26.222481811 +0200
++++ scripts/libast_prereq.sh	2021-03-31 22:45:34.162481713 +0200
+@@ -25,5 +25,5 @@ cd "$MESON_BUILD_ROOT"
+ # Generate header files whose content depends on the current platform.
+ "$MESON_SOURCE_ROOT/scripts/siglist.sh" > features/siglist.h
+ # shellcheck disable=SC2086
+-$CC -D_BLD_DLL $INC_DIRS -std=gnu99 -o "sfinit" "$MESON_SOURCE_ROOT/etc/sfinit.c"
++cc -D_BLD_DLL $INC_DIRS -std=gnu99 -o "sfinit" "$MESON_SOURCE_ROOT/etc/sfinit.c"
+ ./sfinit > features/sfinit.h
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b02..8937bdcb3e4b 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -4,14 +4,16 @@ version=2020.0.0
 revision=1
 wrksrc="ast-${version}"
 build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+build_helper="qemu"
+configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true
+ -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
 short_desc="AT&T's Korn shell (ksh93)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="http://www.kornshell.com/"
 distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
 checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
-nocross=yes
+#nocross=yes
 
 register_shell="/bin/ksh"
 alternatives="

Re: [PR PATCH] [Updated] ksh: fix cross build

[Gottox]

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

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

https://github.com/Gottox/void-packages ksh-cross
https://github.com/void-linux/void-packages/pull/29911

ksh: fix cross build


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

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

From 6218cf30f76c754a10e71858e07e2180e7f73cb4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 Mar 2021 22:57:22 +0200
Subject: [PATCH] ksh: fix cross build

---
 srcpkgs/ksh/patches/fix-cross.diff | 9 +++++++++
 srcpkgs/ksh/template               | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ksh/patches/fix-cross.diff

diff --git a/srcpkgs/ksh/patches/fix-cross.diff b/srcpkgs/ksh/patches/fix-cross.diff
new file mode 100644
index 000000000000..dfefdaccb6b5
--- /dev/null
+++ b/srcpkgs/ksh/patches/fix-cross.diff
@@ -0,0 +1,9 @@
+--- scripts/libast_prereq.sh.orig	2021-03-31 22:45:26.222481811 +0200
++++ scripts/libast_prereq.sh	2021-03-31 22:45:34.162481713 +0200
+@@ -25,5 +25,5 @@ cd "$MESON_BUILD_ROOT"
+ # Generate header files whose content depends on the current platform.
+ "$MESON_SOURCE_ROOT/scripts/siglist.sh" > features/siglist.h
+ # shellcheck disable=SC2086
+-$CC -D_BLD_DLL $INC_DIRS -std=gnu99 -o "sfinit" "$MESON_SOURCE_ROOT/etc/sfinit.c"
++cc -D_BLD_DLL $INC_DIRS -std=gnu99 -o "sfinit" "$MESON_SOURCE_ROOT/etc/sfinit.c"
+ ./sfinit > features/sfinit.h
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b02..4ed769d4e008 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -4,14 +4,15 @@ version=2020.0.0
 revision=1
 wrksrc="ast-${version}"
 build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
+build_helper="qemu"
+configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true
+ -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
 short_desc="AT&T's Korn shell (ksh93)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="http://www.kornshell.com/"
 distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
 checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
-nocross=yes
 
 register_shell="/bin/ksh"
 alternatives="

Re: [PR REVIEW] ksh: fix cross build

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29911#discussion_r605221082

Comment:
Is this safe?

>  Generate header files whose content depends on the current platform.

Worries me slightly :/

Re: [PR REVIEW] ksh: fix cross build

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29911#discussion_r605221557

Comment:
I think this is added by default by the build style, isn't it? In the toolchain file.

Re: [PR REVIEW] ksh: fix cross build

[Gottox]

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

New review comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29911#discussion_r605405767

Comment:
You're right. I thought the build just relied on ast_config.h, but there are other compiler macros used.

Re: ksh: fix cross build

[Gottox]

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

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29911#issuecomment-814387710

Comment:
Will be fixed with the new release. 

Re: [PR PATCH] [Closed]: ksh: fix cross build

[Gottox]

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

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

ksh: fix cross build
https://github.com/void-linux/void-packages/pull/29911

Description: