From 5531ec27e55f41946a442c9b92ec3145546614bc Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 19 Aug 2021 17:34:57 +0200 Subject: [PATCH] dns2tcp: fix duplicate symbol debug Error: ld: error: duplicate symbol: debug >>> defined at rr.c >>> rr.o:(debug) >>> defined at main.c >>> main.o:(.bss+0x0) happen when trying to build with android-ndk r22 or r23. More info: https://go-review.googlesource.com/c/go/+/280312 --- packages/dns2tcp/build.sh | 1 + packages/dns2tcp/duplicate_symbol.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/dns2tcp/duplicate_symbol.patch diff --git a/packages/dns2tcp/build.sh b/packages/dns2tcp/build.sh index 1b705e717..ce70b29c5 100644 --- a/packages/dns2tcp/build.sh +++ b/packages/dns2tcp/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="dns2tcp is a tool for relaying TCP connections over DNS" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Marlin Sööse " TERMUX_PKG_VERSION=0.5.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/alex-sector/dns2tcp/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=4f6e0ed0f5a1aa079a4d377c6d2b16da8ddcffae7d1ddad1280c3e209ada410c TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/dns2tcp/duplicate_symbol.patch b/packages/dns2tcp/duplicate_symbol.patch new file mode 100644 index 000000000..de8a9e384 --- /dev/null +++ b/packages/dns2tcp/duplicate_symbol.patch @@ -0,0 +1,11 @@ +--- ./common/includes/debug.h.orig 2021-08-19 17:33:25.204243470 +0200 ++++ ./common/includes/debug.h 2021-08-19 17:33:31.160911682 +0200 +@@ -24,7 +24,7 @@ + #include + #include + +-int debug; ++int debug __attribute__((common)); + + #ifndef _WIN32 + #define DPRINTF(level, fmt, args...) \