user/guile{,20}: merge packages. force bootstrap on ppc. fixes #533, #691.

3 files changed, 10 insertions, 66 deletions

diff --git a/user/guile/APKBUILD b/user/guile/APKBUILD
index 7d1d1c960..871131af0 100644
--- a/user/guile/APKBUILD
+++ b/user/guile/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Zach van Rijn <me@zv.io>
 pkgname=guile
 pkgver=2.2.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Portable, embeddable Scheme implementation written in C"
 url="https://www.gnu.org/software/guile/"
-arch="all !ppc"  # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26854
+arch="all"
 options="!check !dbg !strip"  # Requires actual LC_COLLATE and LC_MONETARY support.
 license="LGPL-3.0+ AND GPL-3.0+"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
@@ -16,6 +16,14 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
 	0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
 	"
 
+prepare() {
+	default_prepare
+
+	case "$CARCH" in
+		ppc)	rm -fvr prebuilt/32-bit-big-endian; ;; #533
+	esac
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
deleted file mode 100644
index cbe194dfd..000000000
--- a/user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From be9d97e0eeb2423b86fad7094a462b142f5176f7 Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Sun, 18 Mar 2012 13:28:24 -0500
-Subject: Mark "mutex with owner not retained" threads test as unresolved.
-
-As per discussion with upstream, mark this test as unresolved since it
-may produce false negatives, depending on the behavior/timing of the
-garbage collector.
----
- test-suite/tests/threads.test | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
-index 8178120..7d180de 100644
---- a/test-suite/tests/threads.test
-+++ b/test-suite/tests/threads.test
-@@ -412,8 +412,10 @@
- 
-             (gc) (gc)
-             (let ((m (g)))
--              (and (mutex? m)
--                   (eq? (mutex-owner m) (current-thread)))))))
-+              (or
-+               (and (mutex? m)
-+                    (eq? (mutex-owner m) (current-thread)))
-+               (throw 'unresolved))))))
- 
-       ;;
-       ;; mutex lock levels
diff --git a/user/guile20/APKBUILD b/user/guile20/APKBUILD
deleted file mode 100644
index c088637e0..000000000
--- a/user/guile20/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: 
-pkgname=guile
-pkgver=2.0.14
-pkgrel=0
-pkgdesc="Portable, embeddable Scheme implementation written in C"
-url="https://www.gnu.org/software/guile/"
-arch="ppc"  # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26854
-options="!check"  # Requires actual LC_COLLATE and LC_MONETARY support.
-license="LGPL-3.0+ AND GPL-3.0+"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-depends=""
-depends_dev="guile gc-dev"
-makedepends="gc-dev gmp-dev libffi-dev libtool libunistring-dev ncurses-dev
-	texinfo"
-source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
-	"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-error-on-warning \
-		--disable-static
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	rm "$pkgdir"/usr/lib/charset.alias
-}
-
-sha512sums="d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633  guile-2.0.14.tar.gz
-b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch"