* [PR PATCH] racket: update to 8.6.
@ 2022-08-09 21:46 leahneukirchen
2022-08-09 21:53 ` [PR PATCH] [Updated] " leahneukirchen
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: leahneukirchen @ 2022-08-09 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages racket86
https://github.com/void-linux/void-packages/pull/38566
racket: update to 8.6.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Adapting to new build system.
Use ncurses for new expeditor repl.
Cross-compiles but not tested.
A patch file from https://github.com/void-linux/void-packages/pull/38566.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-racket86-38566.patch --]
[-- Type: text/x-diff, Size: 3921 bytes --]
From 6ea32d699a5697e8f319e717700d9aa5afb8595e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Aug 2022 12:23:12 +0200
Subject: [PATCH] racket: update to 8.6.
---
srcpkgs/racket/patches/build.patch | 27 +++++++++++++++++++++++++++
srcpkgs/racket/template | 20 ++++++++++----------
2 files changed, 37 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/racket/patches/build.patch
diff --git a/srcpkgs/racket/patches/build.patch b/srcpkgs/racket/patches/build.patch
new file mode 100644
index 000000000000..ac0e1f8a64fa
--- /dev/null
+++ b/srcpkgs/racket/patches/build.patch
@@ -0,0 +1,27 @@
+From 053be470e7c5454cdf48e934f3254d2d916bbbc5 Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Sat, 30 Jul 2022 07:06:55 -0600
+Subject: [PATCH] CS makefiles: fix Unix-style install for cross compilation
+
+Closes #4377
+---
+ racket/src/cs/c/build.zuo | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo
+index 7fe59431140..625621ca6e2 100644
+--- a/racket/src/cs/c/build.zuo
++++ b/racket/src/cs/c/build.zuo
+@@ -1023,10 +1023,9 @@
+ (define (setup)
+ (call-with-dest-racket
+ (lambda (bindir dest-racket)
+- (define copytree-racket (and cross? (config-bootstrap-racket)))
++ (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket)))
+ (maybe-copytree config dest-racket copytree-racket at-dir)
+- (run-raco-setup config dest-racket
+- (and cross? (hash-ref (config-bootstrap-racket) 'racket))
++ (run-raco-setup config dest-racket copytree-racket
+ ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`,
+ ;; but redundant should be ok:
+ (list "-MCR" (~a (at-dir "compiled") ":")
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 401f8e71a8e3..fb4927113979 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,35 +1,36 @@
# Template file for 'racket'
pkgname=racket
-version=8.4
+version=8.6
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
wrksrc=${pkgname}-${version}
build_wrksrc=src
build_style=gnu-configure
-configure_args="--enable-useprefix"
-hostmakedepends="gsfonts"
-makedepends="sqlite-devel gtk+3-devel"
+configure_args="--enable-useprefix --enable-curses"
+make_build_args="CC_FOR_BUILD=cc"
+hostmakedepends="liberation-fonts-ttf"
+makedepends="gtk+3-devel liblz4-devel ncurses-devel sqlite-devel zlib-devel"
depends="gtk+3 libssl1.1"
short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=b89faf2fe16d04d20b9056f08bba99eb2040d5172bee8f3ceb3999fed16e6ad3
+checksum=2eff3e97bc7a10cfa0320da9b07f0d488653b0b5b8490322c82f384ae0fa1a28
nostrip=yes
+patch_args="-Np2"
if [ "$CROSS_BUILD" ]; then
_chezscheme_path="${XBPS_BUILDDIR}/${wrksrc}/${build_wrksrc}"
configure_args+=" --enable-racket=/usr/bin/racket
- --enable-scheme=${_chezscheme_path}"
+ --enable-scheme=${_chezscheme_path}"
hostmakedepends+=" racket sqlite-devel"
# Build ChezScheme for the host so we can use it to build Racket
# Using "--enable-racket=auto" above selects the wrong compiler toolchain
pre_build() {
- # Make sure we don't get lost
- _correct_position=$(pwd)
+ (
cd ${_chezscheme_path}/ChezScheme
# If this builds the wrong arch, Racket's automatic
@@ -47,8 +48,7 @@ if [ "$CROSS_BUILD" ]; then
-LDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/lib -rdynamic" \
./configure --disable-curses --disable-x11
make
-
- cd ${_correct_position}
+ )
}
fi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] racket: update to 8.6.
2022-08-09 21:46 [PR PATCH] racket: update to 8.6 leahneukirchen
@ 2022-08-09 21:53 ` leahneukirchen
2022-08-10 9:49 ` leahneukirchen
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-08-09 21:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages racket86
https://github.com/void-linux/void-packages/pull/38566
racket: update to 8.6.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Adapting to new build system.
Use ncurses for new expeditor repl.
Cross-compiles but not tested.
A patch file from https://github.com/void-linux/void-packages/pull/38566.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-racket86-38566.patch --]
[-- Type: text/x-diff, Size: 3922 bytes --]
From b7477b64e5e793796fd0fdcedb92f9dc0518d67f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Aug 2022 12:23:12 +0200
Subject: [PATCH] racket: update to 8.6.
---
srcpkgs/racket/patches/build.patch | 27 +++++++++++++++++++++++++++
srcpkgs/racket/template | 21 ++++++++++-----------
2 files changed, 37 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/racket/patches/build.patch
diff --git a/srcpkgs/racket/patches/build.patch b/srcpkgs/racket/patches/build.patch
new file mode 100644
index 000000000000..ac0e1f8a64fa
--- /dev/null
+++ b/srcpkgs/racket/patches/build.patch
@@ -0,0 +1,27 @@
+From 053be470e7c5454cdf48e934f3254d2d916bbbc5 Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Sat, 30 Jul 2022 07:06:55 -0600
+Subject: [PATCH] CS makefiles: fix Unix-style install for cross compilation
+
+Closes #4377
+---
+ racket/src/cs/c/build.zuo | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo
+index 7fe59431140..625621ca6e2 100644
+--- a/racket/src/cs/c/build.zuo
++++ b/racket/src/cs/c/build.zuo
+@@ -1023,10 +1023,9 @@
+ (define (setup)
+ (call-with-dest-racket
+ (lambda (bindir dest-racket)
+- (define copytree-racket (and cross? (config-bootstrap-racket)))
++ (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket)))
+ (maybe-copytree config dest-racket copytree-racket at-dir)
+- (run-raco-setup config dest-racket
+- (and cross? (hash-ref (config-bootstrap-racket) 'racket))
++ (run-raco-setup config dest-racket copytree-racket
+ ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`,
+ ;; but redundant should be ok:
+ (list "-MCR" (~a (at-dir "compiled") ":")
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 401f8e71a8e3..c281daae9366 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,35 +1,35 @@
# Template file for 'racket'
pkgname=racket
-version=8.4
+version=8.6
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
-wrksrc=${pkgname}-${version}
build_wrksrc=src
build_style=gnu-configure
-configure_args="--enable-useprefix"
-hostmakedepends="gsfonts"
-makedepends="sqlite-devel gtk+3-devel"
+configure_args="--enable-useprefix --enable-curses"
+make_build_args="CC_FOR_BUILD=cc"
+hostmakedepends="liberation-fonts-ttf"
+makedepends="gtk+3-devel liblz4-devel ncurses-devel sqlite-devel zlib-devel"
depends="gtk+3 libssl1.1"
short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=b89faf2fe16d04d20b9056f08bba99eb2040d5172bee8f3ceb3999fed16e6ad3
+checksum=2eff3e97bc7a10cfa0320da9b07f0d488653b0b5b8490322c82f384ae0fa1a28
nostrip=yes
+patch_args="-Np2"
if [ "$CROSS_BUILD" ]; then
_chezscheme_path="${XBPS_BUILDDIR}/${wrksrc}/${build_wrksrc}"
configure_args+=" --enable-racket=/usr/bin/racket
- --enable-scheme=${_chezscheme_path}"
+ --enable-scheme=${_chezscheme_path}"
hostmakedepends+=" racket sqlite-devel"
# Build ChezScheme for the host so we can use it to build Racket
# Using "--enable-racket=auto" above selects the wrong compiler toolchain
pre_build() {
- # Make sure we don't get lost
- _correct_position=$(pwd)
+ (
cd ${_chezscheme_path}/ChezScheme
# If this builds the wrong arch, Racket's automatic
@@ -47,8 +47,7 @@ if [ "$CROSS_BUILD" ]; then
-LDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/lib -rdynamic" \
./configure --disable-curses --disable-x11
make
-
- cd ${_correct_position}
+ )
}
fi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] racket: update to 8.6.
2022-08-09 21:46 [PR PATCH] racket: update to 8.6 leahneukirchen
2022-08-09 21:53 ` [PR PATCH] [Updated] " leahneukirchen
@ 2022-08-10 9:49 ` leahneukirchen
2022-08-10 10:00 ` leahneukirchen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-08-10 9:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages racket86
https://github.com/void-linux/void-packages/pull/38566
racket: update to 8.6.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Adapting to new build system.
Use ncurses for new expeditor repl.
Cross-compiles but not tested.
A patch file from https://github.com/void-linux/void-packages/pull/38566.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-racket86-38566.patch --]
[-- Type: text/x-diff, Size: 4000 bytes --]
From 7429963d638d128a2a033f5d1c330c0ffba743c5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Aug 2022 12:23:12 +0200
Subject: [PATCH] racket: update to 8.6.
---
srcpkgs/racket/patches/build.patch | 27 +++++++++++++++++++++++++++
srcpkgs/racket/template | 25 +++++++++++--------------
2 files changed, 38 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/racket/patches/build.patch
diff --git a/srcpkgs/racket/patches/build.patch b/srcpkgs/racket/patches/build.patch
new file mode 100644
index 000000000000..ac0e1f8a64fa
--- /dev/null
+++ b/srcpkgs/racket/patches/build.patch
@@ -0,0 +1,27 @@
+From 053be470e7c5454cdf48e934f3254d2d916bbbc5 Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Sat, 30 Jul 2022 07:06:55 -0600
+Subject: [PATCH] CS makefiles: fix Unix-style install for cross compilation
+
+Closes #4377
+---
+ racket/src/cs/c/build.zuo | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo
+index 7fe59431140..625621ca6e2 100644
+--- a/racket/src/cs/c/build.zuo
++++ b/racket/src/cs/c/build.zuo
+@@ -1023,10 +1023,9 @@
+ (define (setup)
+ (call-with-dest-racket
+ (lambda (bindir dest-racket)
+- (define copytree-racket (and cross? (config-bootstrap-racket)))
++ (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket)))
+ (maybe-copytree config dest-racket copytree-racket at-dir)
+- (run-raco-setup config dest-racket
+- (and cross? (hash-ref (config-bootstrap-racket) 'racket))
++ (run-raco-setup config dest-racket copytree-racket
+ ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`,
+ ;; but redundant should be ok:
+ (list "-MCR" (~a (at-dir "compiled") ":")
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 401f8e71a8e3..4e89e746ec5c 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,36 +1,34 @@
# Template file for 'racket'
pkgname=racket
-version=8.4
+version=8.6
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
-wrksrc=${pkgname}-${version}
build_wrksrc=src
build_style=gnu-configure
-configure_args="--enable-useprefix"
-hostmakedepends="gsfonts"
-makedepends="sqlite-devel gtk+3-devel"
+configure_args="--enable-useprefix --enable-curses"
+make_build_args="CC_FOR_BUILD=cc"
+hostmakedepends="liberation-fonts-ttf"
+makedepends="gtk+3-devel liblz4-devel ncurses-devel sqlite-devel zlib-devel"
depends="gtk+3 libssl1.1"
short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=b89faf2fe16d04d20b9056f08bba99eb2040d5172bee8f3ceb3999fed16e6ad3
+checksum=2eff3e97bc7a10cfa0320da9b07f0d488653b0b5b8490322c82f384ae0fa1a28
nostrip=yes
+patch_args="-Np2"
if [ "$CROSS_BUILD" ]; then
- _chezscheme_path="${XBPS_BUILDDIR}/${wrksrc}/${build_wrksrc}"
-
configure_args+=" --enable-racket=/usr/bin/racket
- --enable-scheme=${_chezscheme_path}"
+ --enable-scheme=${_chezscheme_path}"
hostmakedepends+=" racket sqlite-devel"
# Build ChezScheme for the host so we can use it to build Racket
# Using "--enable-racket=auto" above selects the wrong compiler toolchain
pre_build() {
- # Make sure we don't get lost
- _correct_position=$(pwd)
- cd ${_chezscheme_path}/ChezScheme
+ (
+ cd ChezScheme
# If this builds the wrong arch, Racket's automatic
# arch detection for the ChezScheme build has failed.
@@ -47,8 +45,7 @@ if [ "$CROSS_BUILD" ]; then
-LDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/lib -rdynamic" \
./configure --disable-curses --disable-x11
make
-
- cd ${_correct_position}
+ )
}
fi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] racket: update to 8.6.
2022-08-09 21:46 [PR PATCH] racket: update to 8.6 leahneukirchen
2022-08-09 21:53 ` [PR PATCH] [Updated] " leahneukirchen
2022-08-10 9:49 ` leahneukirchen
@ 2022-08-10 10:00 ` leahneukirchen
2022-08-10 12:05 ` leahneukirchen
2022-08-10 20:21 ` [PR PATCH] [Merged]: " leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-08-10 10:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages racket86
https://github.com/void-linux/void-packages/pull/38566
racket: update to 8.6.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Adapting to new build system.
Use ncurses for new expeditor repl.
Cross-compiles but not tested.
A patch file from https://github.com/void-linux/void-packages/pull/38566.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-racket86-38566.patch --]
[-- Type: text/x-diff, Size: 4000 bytes --]
From 0e1de769239d832b5618bb9d30929085f2bc5c9b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Aug 2022 12:23:12 +0200
Subject: [PATCH] racket: update to 8.6.
---
srcpkgs/racket/patches/build.patch | 27 +++++++++++++++++++++++++++
srcpkgs/racket/template | 25 +++++++++++--------------
2 files changed, 38 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/racket/patches/build.patch
diff --git a/srcpkgs/racket/patches/build.patch b/srcpkgs/racket/patches/build.patch
new file mode 100644
index 000000000000..ac0e1f8a64fa
--- /dev/null
+++ b/srcpkgs/racket/patches/build.patch
@@ -0,0 +1,27 @@
+From 053be470e7c5454cdf48e934f3254d2d916bbbc5 Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Sat, 30 Jul 2022 07:06:55 -0600
+Subject: [PATCH] CS makefiles: fix Unix-style install for cross compilation
+
+Closes #4377
+---
+ racket/src/cs/c/build.zuo | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo
+index 7fe59431140..625621ca6e2 100644
+--- a/racket/src/cs/c/build.zuo
++++ b/racket/src/cs/c/build.zuo
+@@ -1023,10 +1023,9 @@
+ (define (setup)
+ (call-with-dest-racket
+ (lambda (bindir dest-racket)
+- (define copytree-racket (and cross? (config-bootstrap-racket)))
++ (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket)))
+ (maybe-copytree config dest-racket copytree-racket at-dir)
+- (run-raco-setup config dest-racket
+- (and cross? (hash-ref (config-bootstrap-racket) 'racket))
++ (run-raco-setup config dest-racket copytree-racket
+ ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`,
+ ;; but redundant should be ok:
+ (list "-MCR" (~a (at-dir "compiled") ":")
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 401f8e71a8e3..4e89e746ec5c 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,36 +1,34 @@
# Template file for 'racket'
pkgname=racket
-version=8.4
+version=8.6
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
-wrksrc=${pkgname}-${version}
build_wrksrc=src
build_style=gnu-configure
-configure_args="--enable-useprefix"
-hostmakedepends="gsfonts"
-makedepends="sqlite-devel gtk+3-devel"
+configure_args="--enable-useprefix --enable-curses"
+make_build_args="CC_FOR_BUILD=cc"
+hostmakedepends="liberation-fonts-ttf"
+makedepends="gtk+3-devel liblz4-devel ncurses-devel sqlite-devel zlib-devel"
depends="gtk+3 libssl1.1"
short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=b89faf2fe16d04d20b9056f08bba99eb2040d5172bee8f3ceb3999fed16e6ad3
+checksum=2eff3e97bc7a10cfa0320da9b07f0d488653b0b5b8490322c82f384ae0fa1a28
nostrip=yes
+patch_args="-Np2"
if [ "$CROSS_BUILD" ]; then
- _chezscheme_path="${XBPS_BUILDDIR}/${wrksrc}/${build_wrksrc}"
-
configure_args+=" --enable-racket=/usr/bin/racket
- --enable-scheme=${_chezscheme_path}"
+ --enable-scheme=${_chezscheme_path}"
hostmakedepends+=" racket sqlite-devel"
# Build ChezScheme for the host so we can use it to build Racket
# Using "--enable-racket=auto" above selects the wrong compiler toolchain
pre_build() {
- # Make sure we don't get lost
- _correct_position=$(pwd)
- cd ${_chezscheme_path}/ChezScheme
+ (
+ cd ChezScheme
# If this builds the wrong arch, Racket's automatic
# arch detection for the ChezScheme build has failed.
@@ -47,8 +45,7 @@ if [ "$CROSS_BUILD" ]; then
-LDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/lib -rdynamic" \
./configure --disable-curses --disable-x11
make
-
- cd ${_correct_position}
+ )
}
fi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] racket: update to 8.6.
2022-08-09 21:46 [PR PATCH] racket: update to 8.6 leahneukirchen
` (2 preceding siblings ...)
2022-08-10 10:00 ` leahneukirchen
@ 2022-08-10 12:05 ` leahneukirchen
2022-08-10 20:21 ` [PR PATCH] [Merged]: " leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-08-10 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages racket86
https://github.com/void-linux/void-packages/pull/38566
racket: update to 8.6.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Adapting to new build system.
Use ncurses for new expeditor repl.
Cross-compiles but not tested.
A patch file from https://github.com/void-linux/void-packages/pull/38566.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-racket86-38566.patch --]
[-- Type: text/x-diff, Size: 3971 bytes --]
From 17de907e7899fea10b8bb0444c212cd6ed561afd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Aug 2022 12:23:12 +0200
Subject: [PATCH] racket: update to 8.6.
---
srcpkgs/racket/patches/build.patch | 27 +++++++++++++++++++++++++++
srcpkgs/racket/template | 22 +++++++++++-----------
2 files changed, 38 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/racket/patches/build.patch
diff --git a/srcpkgs/racket/patches/build.patch b/srcpkgs/racket/patches/build.patch
new file mode 100644
index 000000000000..ac0e1f8a64fa
--- /dev/null
+++ b/srcpkgs/racket/patches/build.patch
@@ -0,0 +1,27 @@
+From 053be470e7c5454cdf48e934f3254d2d916bbbc5 Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Sat, 30 Jul 2022 07:06:55 -0600
+Subject: [PATCH] CS makefiles: fix Unix-style install for cross compilation
+
+Closes #4377
+---
+ racket/src/cs/c/build.zuo | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo
+index 7fe59431140..625621ca6e2 100644
+--- a/racket/src/cs/c/build.zuo
++++ b/racket/src/cs/c/build.zuo
+@@ -1023,10 +1023,9 @@
+ (define (setup)
+ (call-with-dest-racket
+ (lambda (bindir dest-racket)
+- (define copytree-racket (and cross? (config-bootstrap-racket)))
++ (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket)))
+ (maybe-copytree config dest-racket copytree-racket at-dir)
+- (run-raco-setup config dest-racket
+- (and cross? (hash-ref (config-bootstrap-racket) 'racket))
++ (run-raco-setup config dest-racket copytree-racket
+ ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`,
+ ;; but redundant should be ok:
+ (list "-MCR" (~a (at-dir "compiled") ":")
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 401f8e71a8e3..a6f280081cbd 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,35 +1,36 @@
# Template file for 'racket'
pkgname=racket
-version=8.4
+version=8.6
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
-wrksrc=${pkgname}-${version}
+wrksrc="${pkgname}-${version}" # needed below
build_wrksrc=src
build_style=gnu-configure
-configure_args="--enable-useprefix"
-hostmakedepends="gsfonts"
-makedepends="sqlite-devel gtk+3-devel"
+configure_args="--enable-useprefix --enable-curses"
+make_build_args="CC_FOR_BUILD=cc"
+hostmakedepends="liberation-fonts-ttf"
+makedepends="gtk+3-devel liblz4-devel ncurses-devel sqlite-devel zlib-devel"
depends="gtk+3 libssl1.1"
short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=b89faf2fe16d04d20b9056f08bba99eb2040d5172bee8f3ceb3999fed16e6ad3
+checksum=2eff3e97bc7a10cfa0320da9b07f0d488653b0b5b8490322c82f384ae0fa1a28
nostrip=yes
+patch_args="-Np2"
if [ "$CROSS_BUILD" ]; then
_chezscheme_path="${XBPS_BUILDDIR}/${wrksrc}/${build_wrksrc}"
configure_args+=" --enable-racket=/usr/bin/racket
- --enable-scheme=${_chezscheme_path}"
+ --enable-scheme=${_chezscheme_path}"
hostmakedepends+=" racket sqlite-devel"
# Build ChezScheme for the host so we can use it to build Racket
# Using "--enable-racket=auto" above selects the wrong compiler toolchain
pre_build() {
- # Make sure we don't get lost
- _correct_position=$(pwd)
+ (
cd ${_chezscheme_path}/ChezScheme
# If this builds the wrong arch, Racket's automatic
@@ -47,8 +48,7 @@ if [ "$CROSS_BUILD" ]; then
-LDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/lib -rdynamic" \
./configure --disable-curses --disable-x11
make
-
- cd ${_correct_position}
+ )
}
fi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: racket: update to 8.6.
2022-08-09 21:46 [PR PATCH] racket: update to 8.6 leahneukirchen
` (3 preceding siblings ...)
2022-08-10 12:05 ` leahneukirchen
@ 2022-08-10 20:21 ` leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-08-10 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There's a merged pull request on the void-packages repository
racket: update to 8.6.
https://github.com/void-linux/void-packages/pull/38566
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Adapting to new build system.
Use ncurses for new expeditor repl.
Cross-compiles but not tested.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-10 20:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-09 21:46 [PR PATCH] racket: update to 8.6 leahneukirchen
2022-08-09 21:53 ` [PR PATCH] [Updated] " leahneukirchen
2022-08-10 9:49 ` leahneukirchen
2022-08-10 10:00 ` leahneukirchen
2022-08-10 12:05 ` leahneukirchen
2022-08-10 20:21 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).