Browse Source

libgc: Update to latest release

android-5
Fredrik Fornwall 8 years ago
parent
commit
026081b755
  1. 12
      packages/libgc/build.sh
  2. 14
      packages/libgc/pthread_stop_world.c.patch

12
packages/libgc/build.sh

@ -1,15 +1,11 @@
TERMUX_PKG_HOMEPAGE=http://www.hboehm.info/gc/
TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative garbage collector"
# The latest release 7.4.2 is too old for aarch64, use commit on master for now.
# (update below commit and date in version when necessary):
_GC_COMMIT=9ddff68a20c064288da73a4316cabaef661948ab
TERMUX_PKG_VERSION=7.4.201603041111
TERMUX_PKG_SRCURL=https://github.com/ivmai/bdwgc/archive/${_GC_COMMIT}.zip
TERMUX_PKG_FOLDERNAME=bdwgc-$_GC_COMMIT
TERMUX_PKG_VERSION=7.6.0
TERMUX_PKG_SRCURL=http://www.hboehm.info/gc/gc_source/gc-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_RM_AFTER_INSTALL="share/gc"
# Avoid defining structs already defined in api level 21 or beyond
CFLAGS+=" -DGC_DONT_DEFINE_LINK_MAP"
# CFLAGS+=" -DGC_DONT_DEFINE_LINK_MAP"
termux_step_pre_configure () {
cd $TERMUX_PKG_SRCDIR
@ -17,7 +13,7 @@ termux_step_pre_configure () {
}
termux_step_post_extract_package () {
LIBATOMIC_VERSION=7.4.2
LIBATOMIC_VERSION=7.4.4
LIBATOMIC_FILE=libatomic_ops-${LIBATOMIC_VERSION}.tar.gz
test ! -f $TERMUX_PKG_CACHEDIR/$LIBATOMIC_FILE && curl -o $TERMUX_PKG_CACHEDIR/$LIBATOMIC_FILE http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${LIBATOMIC_VERSION}.tar.gz
cd $TERMUX_PKG_SRCDIR

14
packages/libgc/pthread_stop_world.c.patch

@ -1,14 +0,0 @@
The tkill(2) function was removed from libc in NDK r11.
diff -u -r ../bdwgc-c861ec3d1825b5bb450d20bf9091562fa8a81a4d/pthread_stop_world.c ./pthread_stop_world.c
--- ../bdwgc-c861ec3d1825b5bb450d20bf9091562fa8a81a4d/pthread_stop_world.c 2016-01-13 03:34:56.000000000 -0500
+++ ./pthread_stop_world.c 2016-03-10 07:09:03.607785056 -0500
@@ -450,7 +450,7 @@
#endif
#ifdef USE_TKILL_ON_ANDROID
- extern int tkill(pid_t tid, int sig); /* from sys/linux-unistd.h */
+ static int tkill(pid_t tid, int sig) { return tgkill(-1, tid, sig); }
static int android_thread_kill(pid_t tid, int sig)
{
Loading…
Cancel
Save