From 4c4ad1dd852d5eb64dcb2144c9ebe34628345b8d Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 2 Mar 2019 22:53:47 +0100 Subject: [PATCH] libgc: Update from 8.0.2 to 8.0.4 --- packages/libgc/build.sh | 8 ++++---- packages/libgc/os_dep.c.patch | 14 -------------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 packages/libgc/os_dep.c.patch diff --git a/packages/libgc/build.sh b/packages/libgc/build.sh index 072fd65e2..24de4fc2f 100644 --- a/packages/libgc/build.sh +++ b/packages/libgc/build.sh @@ -1,10 +1,10 @@ TERMUX_PKG_HOMEPAGE=http://www.hboehm.info/gc/ TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative garbage collector" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=(8.0.2 - 7.6.8) -TERMUX_PKG_SHA256=(4e8ca4b5b72a3a27971daefaa9b621f0a716695b23baa40b7eac78de2eeb51cb - 1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665) +TERMUX_PKG_VERSION=(8.0.4 + 7.6.10) +TERMUX_PKG_SHA256=(436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d + 587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af) TERMUX_PKG_SRCURL=(https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG_VERSION/gc-$TERMUX_PKG_VERSION.tar.gz https://github.com/ivmai/libatomic_ops/releases/download/v${TERMUX_PKG_VERSION[1]}/libatomic_ops-${TERMUX_PKG_VERSION[1]}.tar.gz) TERMUX_PKG_RM_AFTER_INSTALL="share/gc" diff --git a/packages/libgc/os_dep.c.patch b/packages/libgc/os_dep.c.patch deleted file mode 100644 index 5186e911b..000000000 --- a/packages/libgc/os_dep.c.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r ../gc-8.0.2/os_dep.c ./os_dep.c ---- ../gc-8.0.2/os_dep.c 2018-12-23 21:28:41.000000000 +0000 -+++ ./os_dep.c 2019-01-20 19:58:07.823582155 +0000 -@@ -436,7 +436,9 @@ - - # if (defined(LINUX) || defined(HURD)) && !defined(IGNORE_PROG_DATA_START) - /* Try the easy approaches first: */ --# ifdef HOST_ANDROID -+# ifdef HOST_ANDROID_DISABLED_TERMUX -+ /* This workaround for gold linker when only aarch64 is using it in -+ Termux breaks other arches - apply it to aarch64 only. */ - /* Workaround for "gold" (default) linker (as of Android NDK r10e). */ - if ((word)__data_start < (word)_etext - && (word)_etext < (word)__dso_handle) {