From 1de5a578e6dc85774c2b6bbbbb467df4fa46bd4e Mon Sep 17 00:00:00 2001 From: psykose Date: Sat, 27 May 2023 12:12:21 +0000 Subject: [PATCH] main/guile: upgrade to 3.0.9 --- main/guile/APKBUILD | 13 +++++++++---- main/guile/failing-filesys-test.patch | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 main/guile/failing-filesys-test.patch diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD index a8eae021725..75ea324b701 100644 --- a/main/guile/APKBUILD +++ b/main/guile/APKBUILD @@ -5,8 +5,8 @@ # reverted at any time, at the core team's discretion. pkgname=guile -pkgver=3.0.8 -pkgrel=6 +pkgver=3.0.9 +pkgrel=0 pkgdesc="portable, embeddable Scheme implementation written in C" url="https://www.gnu.org/software/guile/" arch="all" @@ -29,11 +29,12 @@ makedepends=" source="https://ftp.gnu.org/gnu/guile/guile-$pkgver.tar.gz 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch failing-encoding-test.patch + failing-filesys-test.patch " case "$CARCH" in -x86 | x86_64 | mips64) options="$options !strip" ;; # Otherwise we'll get strip: Unable to recognise the format of the input file +x86|x86_64) options="$options !strip" ;; esac prepare() { @@ -52,6 +53,9 @@ prepare() { } build() { + # programming language + CFLAGS="$CFLAGS -g0 -O2" \ + CXXFLAGS="$CXXFLAGS -g0 -O2" \ ./configure \ --build="$CBUILD" \ --host="$CHOST" \ @@ -84,7 +88,8 @@ readline() { } sha512sums=" -7b2728e849a3ee482fe9a167dd76cc4835e911cc94ca0724dd51e8a813a240c6b5d2de84de16b46469ab24305b5b153a3c812fec942e007d3310bba4d1cf947d guile-3.0.8.tar.gz +6fd14f0860c7f5b7a9b53c43a60c6a7ca53072684ddc818cd10c720af2c5761ef110b29af466b89ded884fb66d66060894b14e615eaebee8844c397932d05fa2 guile-3.0.9.tar.gz 54a9fe0fa2ea83da7ae61f96612e3e653ec80f60ab41d1995dc44bd05c7ff68cc4fab36a655e8835c4ab1cf0966765a299ef2d73cb9f69d3ef955e6aeaa8062d 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch 257b32dda7a9195f14dadb00e2699fa7711198087f78cc100b768cf9d5bb8a0d69fb5b84003a893e05c63b7f6fb9f550d3991fb41d840d9826214529d20610c1 failing-encoding-test.patch +810e4afc6b097c169672e23725426a9a523c1bdeabe7770e3dfb9ad0b2e0c0f93c7207e1d34b1190f71ae8518a488ecae3f114094db5aa74f086d42ae7a30381 failing-filesys-test.patch " diff --git a/main/guile/failing-filesys-test.patch b/main/guile/failing-filesys-test.patch new file mode 100644 index 00000000000..a64df5fe362 --- /dev/null +++ b/main/guile/failing-filesys-test.patch @@ -0,0 +1,24 @@ +diff --git a/test-suite/tests/filesys.test b/test-suite/tests/filesys.test +index 45e77c8..a887109 100644 +--- a/test-suite/tests/filesys.test ++++ b/test-suite/tests/filesys.test +@@ -457,19 +457,6 @@ + (pass-if-equal "file name of symlink" (test-file) + (readlink (test-symlink))) + +- (pass-if-equal "port representing a symlink" (test-file) +- (let () +- (unless (and (provided? 'readlink-port) +- (defined? 'O_NOFOLLOW) +- (defined? 'O_PATH) +- (not (= 0 O_NOFOLLOW)) +- (not (= 0 O_PATH))) +- (throw 'unsupported)) +- (define port (open (test-symlink) (logior O_NOFOLLOW O_PATH))) +- (define points-to (false-if-exception (readlink port))) +- (close-port port) +- points-to)) +- + (pass-if-exception "not a port or file name" exception:wrong-type-arg + (readlink '(stuff))))) +