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
This commit is contained in:
Henrik Grimler 2021-08-19 17:34:57 +02:00
parent 218a206274
commit 5531ec27e5
2 changed files with 12 additions and 0 deletions

View File

@ -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 <marlin.soose@laro.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

View File

@ -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 <stdio.h>
#include <time.h>
-int debug;
+int debug __attribute__((common));
#ifndef _WIN32
#define DPRINTF(level, fmt, args...) \