From 7429963d638d128a2a033f5d1c330c0ffba743c5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen 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 +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 " 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