Browse Source

libgc: Update from 7.6.8 to 8.0.2

android-5
Fredrik Fornwall 6 years ago
parent
commit
bd36177bbf
  1. 8
      packages/libgc/build.sh
  2. 11
      packages/libgc/include-private-gcconfig.h.patch
  3. 17
      packages/libgc/os_dep.c.patch
  4. 13
      packages/libgc/pthread_stop_world.c.patch
  5. 1
      packages/zile/build.sh

8
packages/libgc/build.sh

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=http://www.hboehm.info/gc/ TERMUX_PKG_HOMEPAGE=http://www.hboehm.info/gc/
TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative garbage collector" TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative garbage collector"
TERMUX_PKG_VERSION=(7.6.8 TERMUX_PKG_VERSION=(8.0.2
7.6.6) 7.6.8)
TERMUX_PKG_SHA256=(040ac5cdbf1bebc7c8cd4928996bbae0c54497c151ea5639838fa0128102e258 TERMUX_PKG_SHA256=(4e8ca4b5b72a3a27971daefaa9b621f0a716695b23baa40b7eac78de2eeb51cb
99feabc5f54877f314db4fadeb109f0b3e1d1a54afb6b4b3dfba1e707e38e074) 1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665)
TERMUX_PKG_SRCURL=(https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG_VERSION/gc-$TERMUX_PKG_VERSION.tar.gz 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) 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" TERMUX_PKG_RM_AFTER_INSTALL="share/gc"

11
packages/libgc/include-private-gcconfig.h.patch

@ -0,0 +1,11 @@
diff -u -r ../gc-8.0.2/include/private/gcconfig.h ./include/private/gcconfig.h
--- ../gc-8.0.2/include/private/gcconfig.h 2018-12-23 21:28:41.000000000 +0000
+++ ./include/private/gcconfig.h 2019-01-20 21:31:50.050945027 +0000
@@ -2283,6 +2283,7 @@
# define HBLKSIZE 4096
# endif
# ifdef LINUX
+# define SEARCH_FOR_DATA_START
# define OS_TYPE "LINUX"
# define LINUX_STACKBOTTOM
# define DYNAMIC_LOADING

17
packages/libgc/os_dep.c.patch

@ -1,15 +1,14 @@
--- ../cache/gc-7.6.0/os_dep.c 2016-08-02 19:36:14.000000000 +0000 diff -u -r ../gc-8.0.2/os_dep.c ./os_dep.c
+++ ./os_dep.c 2017-10-19 03:43:03.800275032 +0000 --- ../gc-8.0.2/os_dep.c 2018-12-23 21:28:41.000000000 +0000
@@ -426,7 +426,11 @@ +++ ./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) # if (defined(LINUX) || defined(HURD)) && !defined(IGNORE_PROG_DATA_START)
/* Try the easy approaches first: */ /* Try the easy approaches first: */
-# ifdef PLATFORM_ANDROID -# ifdef HOST_ANDROID
+ /* this workaround for gold linker when only aarch64 is using it in +# ifdef HOST_ANDROID_DISABLED_TERMUX
+ termux breaks x86_64 and x86 builds and also arm w3m apply it to + /* This workaround for gold linker when only aarch64 is using it in
+ aarch64 only */ + Termux breaks other arches - apply it to aarch64 only. */
+
+# if defined(PLATFORM_ANDROID) && defined(__aarch64__)
/* Workaround for "gold" (default) linker (as of Android NDK r10e). */ /* Workaround for "gold" (default) linker (as of Android NDK r10e). */
if ((word)__data_start < (word)_etext if ((word)__data_start < (word)_etext
&& (word)_etext < (word)__dso_handle) { && (word)_etext < (word)__dso_handle) {

13
packages/libgc/pthread_stop_world.c.patch

@ -1,12 +1,13 @@
diff -u -r ../gc-7.6.0/pthread_stop_world.c ./pthread_stop_world.c diff -u -r ../gc-8.0.2/pthread_stop_world.c ./pthread_stop_world.c
--- ../gc-7.6.0/pthread_stop_world.c 2016-08-02 15:36:14.000000000 -0400 --- ../gc-8.0.2/pthread_stop_world.c 2018-12-23 21:28:41.000000000 +0000
+++ ./pthread_stop_world.c 2016-08-14 16:52:41.334806302 -0400 +++ ./pthread_stop_world.c 2019-01-20 19:48:08.502759151 +0000
@@ -365,7 +365,7 @@ @@ -502,7 +502,8 @@
}
# ifdef USE_TKILL_ON_ANDROID # ifdef USE_TKILL_ON_ANDROID
EXTERN_C_BEGIN
- extern int tkill(pid_t tid, int sig); /* from sys/linux-unistd.h */ - 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 tkill(pid_t tid, int sig) { return tgkill(-1, tid, sig); }
+
EXTERN_C_END
static int android_thread_kill(pid_t tid, int sig) static int android_thread_kill(pid_t tid, int sig)
{

1
packages/zile/build.sh

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/zile/
TERMUX_PKG_DESCRIPTION="Lightweight clone of the Emacs text editor" TERMUX_PKG_DESCRIPTION="Lightweight clone of the Emacs text editor"
TERMUX_PKG_MAINTAINER="Iain Nicol @iainnicol" TERMUX_PKG_MAINTAINER="Iain Nicol @iainnicol"
TERMUX_PKG_VERSION=2.4.14 TERMUX_PKG_VERSION=2.4.14
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/zile/zile-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/zile/zile-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74 TERMUX_PKG_SHA256=7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74
TERMUX_PKG_DEPENDS="libgc, ncurses" TERMUX_PKG_DEPENDS="libgc, ncurses"

Loading…
Cancel
Save