Fix building tsocks for 32 bit architectures

Thanks to @vishalbiswas in #1573
This commit is contained in:
Oliver Schmidhauser 2017-09-25 11:47:40 +02:00 committed by Fredrik Fornwall
parent d4c554ae59
commit 2232fa2c11
2 changed files with 11 additions and 2 deletions

View File

@ -1,12 +1,12 @@
TERMUX_PKG_HOMEPAGE=http://tsocks.sf.net TERMUX_PKG_HOMEPAGE=http://tsocks.sf.net
TERMUX_PKG_DESCRIPTION="transparent network access through a SOCKS 4 or 5 proxy" TERMUX_PKG_DESCRIPTION="transparent network access through a SOCKS 4 or 5 proxy"
TERMUX_PKG_VERSION=1.8beta5 TERMUX_PKG_VERSION=1.8beta5
TERMUX_PKG_REVISION=1
TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tsocks/tsocks/1.8%20beta%205/tsocks-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tsocks/tsocks/1.8%20beta%205/tsocks-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-conf=$TERMUX_PREFIX/etc/tsocks.conf" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-conf=$TERMUX_PREFIX/etc/tsocks.conf"
TERMUX_PKG_BLACKLISTED_ARCHES="i686,arm"
termux_step_pre_configure() { termux_step_pre_configure() {
cp $TERMUX_PKG_SRCDIR/tsocks.conf.complex.example $TERMUX_PREFIX/etc/tsocks.conf cp $TERMUX_PKG_SRCDIR/tsocks.conf.complex.example $TERMUX_PREFIX/etc/tsocks.conf

View File

@ -1,5 +1,5 @@
diff --git a/configure b/configure diff --git a/configure b/configure
index 78e120d..7de513b 100755 index 78e120d..80e5418 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -53,11 +53,11 @@ datadir='${prefix}/share' @@ -53,11 +53,11 @@ datadir='${prefix}/share'
@ -16,6 +16,15 @@ index 78e120d..7de513b 100755
# Initialize some other variables. # Initialize some other variables.
subdirs= subdirs=
@@ -2137,7 +2137,7 @@ EOF
echo $ac_n "checking for correct connect prototype""... $ac_c" 1>&6
echo "configure:2139: checking for correct connect prototype" >&5
PROTO=
-PROTO1='int __fd, const struct sockaddr * __addr, int len'
+PROTO1='int __fd, const struct sockaddr * __addr, int __len'
PROTO2='int __fd, const struct sockaddr_in * __addr, socklen_t __len'
PROTO3='int __fd, struct sockaddr * __addr, int __len'
PROTO4='int __fd, const struct sockaddr * __addr, socklen_t __len'
@@ -2228,7 +2228,8 @@ EOF @@ -2228,7 +2228,8 @@ EOF
echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6 echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6
echo "configure:2230: checking for correct poll prototype" >&5 echo "configure:2230: checking for correct poll prototype" >&5