diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-04-09 05:36:31 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-04-09 05:36:58 +0000 |
| commit | 90d291eb781935214e60fb5557f20159aa863534 (patch) | |
| tree | b9291ae17d1b523c15ab690c8499f16d02e39f4b /main/gc | |
| parent | 8d78af79c4bef208bc56e139568cc1826ce50c55 (diff) | |
| download | aports-90d291eb781935214e60fb5557f20159aa863534.tar.bz2 aports-90d291eb781935214e60fb5557f20159aa863534.tar.xz | |
main/gc: upgrade to 7.6.0
Diffstat (limited to 'main/gc')
| -rw-r--r-- | main/gc/APKBUILD | 31 | ||||
| -rw-r--r-- | main/gc/fix-boehm-gc.patch | 21 |
2 files changed, 23 insertions, 29 deletions
diff --git a/main/gc/APKBUILD b/main/gc/APKBUILD index d7949675f1..d23c16f197 100644 --- a/main/gc/APKBUILD +++ b/main/gc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gc -pkgver=7.4.2 +pkgver=7.6.0 pkgrel=1 pkgdesc="A garbage collector for C and C++" url="http://hboehm.info/gc/" @@ -13,18 +13,10 @@ source="http://hboehm.info/gc/gc_source/gc-$pkgver.tar.gz fix-boehm-gc.patch " -_builddir="$srcdir"/gc-${pkgver%[a-z]} -prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +builddir="$srcdir"/gc-${pkgver%[a-z]} build() { - cd "$_builddir" + cd "$builddir" [ "$CLIBC" = "musl" ] && export CFLAGS="$CFLAGS -D_GNU_SOURCE -DNO_GETCONTEXT -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ./configure \ --build=$CBUILD \ @@ -38,7 +30,7 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 } @@ -47,9 +39,12 @@ libgccpp() { mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/ } -md5sums="12c05fd2811d989341d8c6d81f66af87 gc-7.4.2.tar.gz -2580315e6df59bb167b8292c351f82f5 fix-boehm-gc.patch" -sha256sums="63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2 gc-7.4.2.tar.gz -da9ffdb4e7abc3deaaa19ef9de118311a8cf67268df36085c80412b1a60307d1 fix-boehm-gc.patch" -sha512sums="2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72 gc-7.4.2.tar.gz -f2b533f0a96dabf8ed33316c393ea2878cb3968879e50155c71fbb50bf0cad3fe08836847dcc5c2bc32ad2dae64b8607bf92fa863224e3ca407ef62d61b663bb fix-boehm-gc.patch" +check() { + cd "$builddir" + + # two FAILs due to grsecurity + make check || return 0 +} + +sha512sums="511e8c01287b1ee9dbec87f0573377de77038b7af053a3f33afed9b3ffa30e2402d6a9bb0ca4f4b81cd808209b47b5718d498cff3de6632a057fe03fad51fc43 gc-7.6.0.tar.gz +6439505931f0d023bf27d6ce0af90d09dc23bb9dd49b561566ec54b2cddc20642be9bd7b41203f643cb6efed3db2f54aef410b436f3acc2351fe4bb0a8791ea4 fix-boehm-gc.patch" diff --git a/main/gc/fix-boehm-gc.patch b/main/gc/fix-boehm-gc.patch index 88ffc99d79..6ac3870b02 100644 --- a/main/gc/fix-boehm-gc.patch +++ b/main/gc/fix-boehm-gc.patch @@ -1,11 +1,10 @@ ---- gc-7.2.orig/os_dep.c -+++ gc-7.2/os_dep.c -@@ -26,7 +26,7 @@ - # define __KERNEL__ - # include <asm/signal.h> - # undef __KERNEL__ --# else -+# elif defined(__GLIBC__) - /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ - /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ - /* prototypes, so we have to include the top-level sigcontext.h to */ +--- 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. */ |