From 23e47ad4ea283d79c1eccf87c59731a848fdc6aa Mon Sep 17 00:00:00 2001 From: rsteube Date: Sun, 27 Oct 2024 21:29:56 +0100 Subject: [PATCH] fix makefile --- Makefile | 2 ++ .../6-src-runtime-cgo-cgo.go.patch/patch.diff | 25 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 termux/6-src-runtime-cgo-cgo.go.patch/patch.diff diff --git a/Makefile b/Makefile index 0c2cfb3..3d3ef00 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,8 @@ build-termux: clean $(call apply,termux/2-fix-GOPROXY-and-GOSUMDB-default-is-empty) $(call apply,termux/3-src-crypto-x509-root_linux.go) $(call apply,termux/4-src-os-file_unix.go.patch) + $(call apply,termux/5-src-runtime-cgo-cgo.go.patch) + $(call apply,termux/6-src-runtime-cgo-gcc_android.c.patch) @echo "Building Go from source..." @cd go-src/src && ./make.bash diff --git a/termux/6-src-runtime-cgo-cgo.go.patch/patch.diff b/termux/6-src-runtime-cgo-cgo.go.patch/patch.diff deleted file mode 100644 index 9b1a1b4..0000000 --- a/termux/6-src-runtime-cgo-cgo.go.patch/patch.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -u -r ../go/src/runtime/cgo/gcc_android.c ./src/runtime/cgo/gcc_android.c ---- ../go/src/runtime/cgo/gcc_android.c 2015-08-06 00:36:35.000000000 -0400 -+++ ./src/runtime/cgo/gcc_android.c 2015-08-16 16:08:05.346940583 -0400 -@@ -11,21 +11,11 @@ - { - va_list ap; - -- // Write to both stderr and logcat. -- // -- // When running from an .apk, /dev/stderr and /dev/stdout -- // redirect to /dev/null. And when running a test binary -- // via adb shell, it's easy to miss logcat. -- - fprintf(stderr, "runtime/cgo: "); - va_start(ap, format); - vfprintf(stderr, format, ap); - va_end(ap); - fprintf(stderr, "\n"); - -- va_start(ap, format); -- __android_log_vprint(ANDROID_LOG_FATAL, "runtime/cgo", format, ap); -- va_end(ap); -- - abort(); - }