Skip to content

Commit

Permalink
dns2tcp: fix duplicate symbol debug
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Grimler91 authored and landfillbaby committed Sep 8, 2021
1 parent 3acbd86 commit ab93e49
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions packages/dns2tcp/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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_BUILD_IN_SRC="true"
11 changes: 11 additions & 0 deletions packages/dns2tcp/duplicate_symbol.patch
Original file line number Diff line number Diff line change
@@ -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...) \

0 comments on commit ab93e49

Please sign in to comment.