sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

golang: update to 1.15.8

This commit is contained in:
Leonid Pliushch 2021-02-05 20:48:13 +00:00
parent f205bd8195
commit 2d5fdf9b32
No known key found for this signature in database
GPG Key ID: 45F2964132545795
3 changed files with 4 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/golang/build.sh
View File

@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/
TERMUX_PKG_DESCRIPTION="Go programming language compiler"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
_MAJOR_VERSION=1.15.6
_MAJOR_VERSION=1.15.8
# Use the ~ deb versioning construct in the future:
TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
TERMUX_PKG_SHA256=890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817
TERMUX_PKG_SHA256=540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2
TERMUX_PKG_DEPENDS="clang"
TERMUX_PKG_NO_STATICSPLIT=true

60
packages/golang/clang11-fix.patch
View File

@ -1,60 +0,0 @@
diff -uNr go/src/runtime/cgo/gcc_linux_386.c go.mod/src/runtime/cgo/gcc_linux_386.c
--- go/src/runtime/cgo/gcc_linux_386.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_386.c 2020-12-29 01:13:05.120640580 +0200
@@ -12,7 +12,11 @@
static void (*setg_gcc)(void*);
// This will be set in gcc_android.c for android-specific customization.
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
void
x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase)
diff -uNr go/src/runtime/cgo/gcc_linux_amd64.c go.mod/src/runtime/cgo/gcc_linux_amd64.c
--- go/src/runtime/cgo/gcc_linux_amd64.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_amd64.c 2020-12-29 01:11:57.624063728 +0200
@@ -14,7 +14,11 @@
static void (*setg_gcc)(void*);
// This will be set in gcc_android.c for android-specific customization.
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
void
x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase)
diff -uNr go/src/runtime/cgo/gcc_linux_arm64.c go.mod/src/runtime/cgo/gcc_linux_arm64.c
--- go/src/runtime/cgo/gcc_linux_arm64.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_arm64.c 2020-12-29 01:12:17.648234844 +0200
@@ -12,7 +12,11 @@
static void *threadentry(void*);
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
static void (*setg_gcc)(void*);
void
diff -uNr go/src/runtime/cgo/gcc_linux_arm.c go.mod/src/runtime/cgo/gcc_linux_arm.c
--- go/src/runtime/cgo/gcc_linux_arm.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_arm.c 2020-12-29 01:12:38.656414386 +0200
@@ -10,7 +10,11 @@
static void *threadentry(void*);
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
static void (*setg_gcc)(void*);
void

4
scripts/build/setup/termux_setup_golang.sh
View File

@ -1,7 +1,7 @@
# Utility function for golang-using packages to setup a go toolchain.
termux_setup_golang() {
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
local TERMUX_GO_VERSION=go1.15.6
local TERMUX_GO_VERSION=go1.15.8
local TERMUX_GO_PLATFORM=linux-amd64
local TERMUX_BUILDGO_FOLDER
@ -20,7 +20,7 @@ termux_setup_golang() {
rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
termux_download https://golang.org/dl/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
"$TERMUX_BUILDGO_TAR" \
3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844
d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b
( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
else