From 896a1a22dc55c1a3b6bd8729527fc52ac8e07487 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 10 Mar 2019 05:12:33 +0000
Subject: user/gc: bump to 8.0.4, modernise

---
 user/gc/APKBUILD           | 15 +++------------
 user/gc/fix-boehm-gc.patch | 10 ----------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 user/gc/fix-boehm-gc.patch

(limited to 'user/gc')

diff --git a/user/gc/APKBUILD b/user/gc/APKBUILD
index 96cb7d5ff..39e3cbdfd 100644
--- a/user/gc/APKBUILD
+++ b/user/gc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gc
-pkgver=7.6.8
+pkgver=8.0.4
 pkgrel=0
 pkgdesc="A garbage collector for C and C++"
 url="http://hboehm.info/gc/"
@@ -8,14 +8,9 @@ arch="all"
 license="MIT"
 makedepends="libatomic_ops-dev linux-headers"
 subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp"
-source="https://github.com/ivmai/bdwgc/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
-	fix-boehm-gc.patch
-	"
-builddir="$srcdir/gc-${pkgver%[a-z]}"
+source="https://github.com/ivmai/bdwgc/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-
 	if [ "$CLIBC" = "musl" ]; then
 		export CFLAGS="$CFLAGS -D_GNU_SOURCE -DNO_GETCONTEXT -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
 	fi
@@ -29,8 +24,6 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-
 	if [ "$CARCH" = "ppc" ]; then
 		make check || true
 	else
@@ -39,7 +32,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -48,5 +40,4 @@ libgccpp() {
 	mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="525e84e3de0575a76dc994f746fb60f829c850442b6e4dbec5482000a478bb63b9e8d5ac6ddf677a341312207e228eb64442fd7b177223b86efbb9cef3e74aec  gc-7.6.8.tar.gz
-6439505931f0d023bf27d6ce0af90d09dc23bb9dd49b561566ec54b2cddc20642be9bd7b41203f643cb6efed3db2f54aef410b436f3acc2351fe4bb0a8791ea4  fix-boehm-gc.patch"
+sha512sums="57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e  gc-8.0.4.tar.gz"
diff --git a/user/gc/fix-boehm-gc.patch b/user/gc/fix-boehm-gc.patch
deleted file mode 100644
index 6ac3870b0..000000000
--- a/user/gc/fix-boehm-gc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gc-7.6.0.orig/pthread_stop_world.c
-+++ gc-7.6.0/pthread_stop_world.c
-@@ -45,6 +45,7 @@
- #include <semaphore.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/select.h>
- #include "atomic_ops.h"
- 
- /* It's safe to call original pthread_sigmask() here.   */
-- 
cgit v1.2.3-70-g09d2