[PR PATCH] chez-scheme: update to 10.0.0.

[PR PATCH] chez-scheme: update to 10.0.0.

[leahneukirchen]

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

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

https://github.com/leahneukirchen/void-packages chez10
https://github.com/void-linux/void-packages/pull/48595

chez-scheme: update to 10.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**|
<!--
#### 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/48595.patch is attached

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

From 13205ff74f986d2791aa1ec2ce80a4882a42f109 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Feb 2024 23:59:20 +0100
Subject: [PATCH] chez-scheme: update to 10.0.0.

---
 srcpkgs/chez-scheme/template | 69 ++++++++++++------------------------
 1 file changed, 23 insertions(+), 46 deletions(-)

diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template
index 65bf56f52c117..21b8f7977d84c 100644
--- a/srcpkgs/chez-scheme/template
+++ b/srcpkgs/chez-scheme/template
@@ -1,78 +1,55 @@
 # Template file for 'chez-scheme'
 pkgname=chez-scheme
-version=9.6.4
+version=10.0.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="git libX11-devel liblz4-devel libuuid-devel ncurses-devel zlib-devel"
+build_style=gnu-makefile
+make_build_target="kernel"
+hostmakedepends="libX11-devel liblz4-devel ncurses-devel zlib-devel"
 makedepends="${hostmakedepends}"
 short_desc="Compiler and run-time system for R6RS Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://scheme.com/"
 distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz"
-checksum=f5827682fa259c47975ffe078785fb561e4a5c54f764331ef66c32132843685d
+checksum=d37199012b5ed1985c4069d6a87ff18e5e1f5a2df27e402991faf45dc4f2232c
 alternatives="
  scheme:scheme:/usr/bin/chez-scheme
  scheme:scheme.1:/usr/share/man/man1/chez-scheme.1
 "
 
-archs="i686* x86_64* armv6l* armv7l*"
 case "$XBPS_MACHINE" in
 	i686*) _host=ti3le;;
 	x86_64*) _host=ta6le;;
-	arm*) _host=arm32le;;  # no threading makefile
+	arm*) _host=tarm32le;;
+	aarch64*) _host=tarm64le;;
+	riscv64*) _host=trv64le;;
 	*) broken="unsupported host platform";;
 esac
 case "$XBPS_TARGET_MACHINE" in
 	i686*) _target=ti3le;;
 	x86_64*) _target=ta6le;;
-	arm*) _target=arm32le;;
+	arm*) _target=tarm32le;;
+	aarch64*) _target=tarm64le;;
+	riscv64*) _target=trv64le;;
 	*) broken="unsupported target platform";;
 esac
 
+pre_configure() {
+	# Since version 10, Chez only ships portable boot files, so
+	# first bootstrap to the host platform.
+	./configure --pb ZLIB=-lz LZ4=-llz4 \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" LD="$BUILD_LD"
+	make ${makejobs} bootquick XM=${_host}
+	make ${makejobs} bootquick XM=${_target}
+}
+
 do_configure() {
-	# Configure such that scheme uses the zlib and lz4 system shared libs.
-	# ZLIB and LZ4 is used when building the scheme kernel and use the full path.
-	# LDFLAGS is extended in 'do_build' so that the rest of the scheme system links them.
 	./configure --installprefix=/usr --installman=/usr/share/man \
-		--nogzip-man-pages --temproot=$DESTDIR --machine=$_host \
-		--installschemename=chez-scheme \
-		ZLIB=-L/usr/lib/libz.so LZ4=-L/usr/lib/liblz4.so
+		--nogzip-man-pages --temproot=$DESTDIR --machine=${_target} \
+		--installschemename=chez-scheme ZLIB=-lz LZ4=-llz4
 }
 
 post_install() {
-	# make link relative
+	# replace duplicate file by symlink
 	ln -sf scheme.boot ${DESTDIR}/usr/lib/csv*/*/scheme-script.boot
 }
-
-if [ "$CROSS_BUILD" ]; then
-
-do_build() {
-	# Build host/bootstrap scheme compiler.
-	make ${makejobs} CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		LD="$BUILD_LD" LDFLAGS="-lz -llz4 $BUILD_LDFLAGS"
-	./workarea $_target
-	# Use Mf-config created from 'do_configure'.
-	# This is required. The build fails to include the scheme kernel when this is missing.
-	cd $_target/c
-	ln -sf ../../$_host/c/Mf-config .
-	cd ..
-	# Cross compile to target.
-	make ${makejobs} -C s -f Mf-cross m=$_host xm=$_target base=../../$_host
-	make ${makejobs} -C c CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="-lz -llz4 $LDFLAGS"
-}
-do_install() {
-	cd $_target
-	make -f ../$_host/Mf-install DESTDIR=${DESTDIR} m=$_target
-}
-
-else
-
-do_build() {
-	make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="-lz -llz4 $LDFLAGS"
-}
-do_install() {
-	make DESTDIR=${DESTDIR} install
-}
-
-fi

Re: [PR PATCH] [Updated] chez-scheme: update to 10.0.0.

[leahneukirchen]

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

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

https://github.com/leahneukirchen/void-packages chez10
https://github.com/void-linux/void-packages/pull/48595

chez-scheme: update to 10.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**|
<!--
#### 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/48595.patch is attached

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

From 8d85b8113720cc389613373184c3cc062b72ff08 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Feb 2024 23:59:20 +0100
Subject: [PATCH] chez-scheme: update to 10.0.0.

---
 srcpkgs/chez-scheme/template | 80 ++++++++++++------------------------
 1 file changed, 27 insertions(+), 53 deletions(-)

diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template
index 65bf56f52c117..b2634891e6b1e 100644
--- a/srcpkgs/chez-scheme/template
+++ b/srcpkgs/chez-scheme/template
@@ -1,78 +1,52 @@
 # Template file for 'chez-scheme'
 pkgname=chez-scheme
-version=9.6.4
+version=10.0.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="git libX11-devel liblz4-devel libuuid-devel ncurses-devel zlib-devel"
+build_style=gnu-makefile
+make_build_target="kernel"
+hostmakedepends="libX11-devel liblz4-devel ncurses-devel zlib-devel"
 makedepends="${hostmakedepends}"
 short_desc="Compiler and run-time system for R6RS Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://scheme.com/"
 distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz"
-checksum=f5827682fa259c47975ffe078785fb561e4a5c54f764331ef66c32132843685d
+checksum=d37199012b5ed1985c4069d6a87ff18e5e1f5a2df27e402991faf45dc4f2232c
 alternatives="
  scheme:scheme:/usr/bin/chez-scheme
  scheme:scheme.1:/usr/share/man/man1/chez-scheme.1
 "
 
-archs="i686* x86_64* armv6l* armv7l*"
-case "$XBPS_MACHINE" in
-	i686*) _host=ti3le;;
-	x86_64*) _host=ta6le;;
-	arm*) _host=arm32le;;  # no threading makefile
-	*) broken="unsupported host platform";;
-esac
 case "$XBPS_TARGET_MACHINE" in
 	i686*) _target=ti3le;;
 	x86_64*) _target=ta6le;;
-	arm*) _target=arm32le;;
-	*) broken="unsupported target platform";;
+	arm*) _target=tarm32le;;
+	aarch64*) _target=tarm64le;;
+	riscv64*) _target=trv64le;;
+	*) _target=pb;;  # portable bytecode
 esac
 
+pre_configure() {
+	# Since version 10, Chez only ships portable boot files, so
+	# first bootstrap with --pb, then build the boot files for the
+	# target.  The kernel is (cross-)compiled in do_build.
+	[ $_target = pb ] && return
+	./configure --pb CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" LD="$BUILD_LD" \
+		AR=ar ZLIB=-lz LZ4=-llz4
+	make ${makejobs} bootquick XM=${_target}
+}
+
 do_configure() {
-	# Configure such that scheme uses the zlib and lz4 system shared libs.
-	# ZLIB and LZ4 is used when building the scheme kernel and use the full path.
-	# LDFLAGS is extended in 'do_build' so that the rest of the scheme system links them.
-	./configure --installprefix=/usr --installman=/usr/share/man \
-		--nogzip-man-pages --temproot=$DESTDIR --machine=$_host \
-		--installschemename=chez-scheme \
-		ZLIB=-L/usr/lib/libz.so LZ4=-L/usr/lib/liblz4.so
+	case $_target in
+		pb) target=--pb;;
+		*) target=--machine=$pb;;
+	esac
+	./configure $target --installprefix=/usr --installman=/usr/share/man \
+		--nogzip-man-pages --temproot=$DESTDIR \
+		--installschemename=chez-scheme ZLIB=-lz LZ4=-llz4
 }
 
 post_install() {
-	# make link relative
+	# replace duplicate file by symlink
 	ln -sf scheme.boot ${DESTDIR}/usr/lib/csv*/*/scheme-script.boot
 }
-
-if [ "$CROSS_BUILD" ]; then
-
-do_build() {
-	# Build host/bootstrap scheme compiler.
-	make ${makejobs} CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		LD="$BUILD_LD" LDFLAGS="-lz -llz4 $BUILD_LDFLAGS"
-	./workarea $_target
-	# Use Mf-config created from 'do_configure'.
-	# This is required. The build fails to include the scheme kernel when this is missing.
-	cd $_target/c
-	ln -sf ../../$_host/c/Mf-config .
-	cd ..
-	# Cross compile to target.
-	make ${makejobs} -C s -f Mf-cross m=$_host xm=$_target base=../../$_host
-	make ${makejobs} -C c CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="-lz -llz4 $LDFLAGS"
-}
-do_install() {
-	cd $_target
-	make -f ../$_host/Mf-install DESTDIR=${DESTDIR} m=$_target
-}
-
-else
-
-do_build() {
-	make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="-lz -llz4 $LDFLAGS"
-}
-do_install() {
-	make DESTDIR=${DESTDIR} install
-}
-
-fi

Re: [PR PATCH] [Updated] chez-scheme: update to 10.0.0.

[leahneukirchen]

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

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

https://github.com/leahneukirchen/void-packages chez10
https://github.com/void-linux/void-packages/pull/48595

chez-scheme: update to 10.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**|
<!--
#### 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/48595.patch is attached

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

From 90dfffb8a7135c69056117b746897671e7a674cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Feb 2024 23:59:20 +0100
Subject: [PATCH] chez-scheme: update to 10.0.0.

---
 srcpkgs/chez-scheme/template | 80 ++++++++++++------------------------
 1 file changed, 27 insertions(+), 53 deletions(-)

diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template
index 65bf56f52c117..e3d51dcc5c48e 100644
--- a/srcpkgs/chez-scheme/template
+++ b/srcpkgs/chez-scheme/template
@@ -1,78 +1,52 @@
 # Template file for 'chez-scheme'
 pkgname=chez-scheme
-version=9.6.4
+version=10.0.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="git libX11-devel liblz4-devel libuuid-devel ncurses-devel zlib-devel"
+build_style=gnu-makefile
+make_build_target="kernel"
+hostmakedepends="libX11-devel liblz4-devel ncurses-devel zlib-devel"
 makedepends="${hostmakedepends}"
 short_desc="Compiler and run-time system for R6RS Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://scheme.com/"
 distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz"
-checksum=f5827682fa259c47975ffe078785fb561e4a5c54f764331ef66c32132843685d
+checksum=d37199012b5ed1985c4069d6a87ff18e5e1f5a2df27e402991faf45dc4f2232c
 alternatives="
  scheme:scheme:/usr/bin/chez-scheme
  scheme:scheme.1:/usr/share/man/man1/chez-scheme.1
 "
 
-archs="i686* x86_64* armv6l* armv7l*"
-case "$XBPS_MACHINE" in
-	i686*) _host=ti3le;;
-	x86_64*) _host=ta6le;;
-	arm*) _host=arm32le;;  # no threading makefile
-	*) broken="unsupported host platform";;
-esac
 case "$XBPS_TARGET_MACHINE" in
 	i686*) _target=ti3le;;
 	x86_64*) _target=ta6le;;
-	arm*) _target=arm32le;;
-	*) broken="unsupported target platform";;
+	arm*) _target=tarm32le;;
+	aarch64*) _target=tarm64le;;
+	riscv64*) _target=trv64le;;
+	*) _target=pb;;  # portable bytecode
 esac
 
+pre_configure() {
+	# Since version 10, Chez only ships portable boot files, so
+	# first bootstrap with --pb, then build the boot files for the
+	# target.  The kernel is (cross-)compiled in do_build.
+	[ $_target = pb ] && return
+	./configure --pb CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" LD="$BUILD_LD" \
+		AR=ar ZLIB=-lz LZ4=-llz4
+	make ${makejobs} bootquick XM=${_target}
+}
+
 do_configure() {
-	# Configure such that scheme uses the zlib and lz4 system shared libs.
-	# ZLIB and LZ4 is used when building the scheme kernel and use the full path.
-	# LDFLAGS is extended in 'do_build' so that the rest of the scheme system links them.
-	./configure --installprefix=/usr --installman=/usr/share/man \
-		--nogzip-man-pages --temproot=$DESTDIR --machine=$_host \
-		--installschemename=chez-scheme \
-		ZLIB=-L/usr/lib/libz.so LZ4=-L/usr/lib/liblz4.so
+	case $_target in
+		pb) target=--pb;;
+		*) target=--machine=$_target;;
+	esac
+	./configure $target --installprefix=/usr --installman=/usr/share/man \
+		--nogzip-man-pages --temproot=$DESTDIR \
+		--installschemename=chez-scheme ZLIB=-lz LZ4=-llz4
 }
 
 post_install() {
-	# make link relative
+	# replace duplicate file by symlink
 	ln -sf scheme.boot ${DESTDIR}/usr/lib/csv*/*/scheme-script.boot
 }
-
-if [ "$CROSS_BUILD" ]; then
-
-do_build() {
-	# Build host/bootstrap scheme compiler.
-	make ${makejobs} CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		LD="$BUILD_LD" LDFLAGS="-lz -llz4 $BUILD_LDFLAGS"
-	./workarea $_target
-	# Use Mf-config created from 'do_configure'.
-	# This is required. The build fails to include the scheme kernel when this is missing.
-	cd $_target/c
-	ln -sf ../../$_host/c/Mf-config .
-	cd ..
-	# Cross compile to target.
-	make ${makejobs} -C s -f Mf-cross m=$_host xm=$_target base=../../$_host
-	make ${makejobs} -C c CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="-lz -llz4 $LDFLAGS"
-}
-do_install() {
-	cd $_target
-	make -f ../$_host/Mf-install DESTDIR=${DESTDIR} m=$_target
-}
-
-else
-
-do_build() {
-	make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="-lz -llz4 $LDFLAGS"
-}
-do_install() {
-	make DESTDIR=${DESTDIR} install
-}
-
-fi

Re: [PR PATCH] [Merged]: chez-scheme: update to 10.0.0.

[leahneukirchen]

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

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

chez-scheme: update to 10.0.0.
https://github.com/void-linux/void-packages/pull/48595

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

#### Testing the changes
- I tested the changes in this PR: **briefly**|
<!--
#### 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
-->