From c413f37bf78a844652778fa7d749fc51610b7939 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 7 Jan 2022 07:59:10 +0900 Subject: [PATCH] libtirpc: Fix type of `xdr_{,u_}longlong_t` Causing build error for asymptote: ``` note: candidate function not viable: no known conversion from 'unsigned long long *' to 'uint64_t *' (aka 'unsigned long *') for 2nd argument ``` --- packages/libtirpc/build.sh | 1 + packages/libtirpc/types.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/libtirpc/build.sh b/packages/libtirpc/build.sh index 549dff1d9..fdc698abd 100644 --- a/packages/libtirpc/build.sh +++ b/packages/libtirpc/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Transport Independent RPC library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-gssapi" diff --git a/packages/libtirpc/types.patch b/packages/libtirpc/types.patch index c983bccac..b9dbeaacf 100644 --- a/packages/libtirpc/types.patch +++ b/packages/libtirpc/types.patch @@ -7,8 +7,8 @@ diff -uNr libtirpc-1.2.6/src/xdr.c libtirpc-1.2.6.mod/src/xdr.c -typedef quad_t longlong_t; /* ANSI long long type */ -typedef u_quad_t u_longlong_t; /* ANSI unsigned long long type */ -+typedef int64_t longlong_t; /* ANSI long long type */ -+typedef uint64_t u_longlong_t; /* ANSI unsigned long long type */ ++typedef long long longlong_t; /* ANSI long long type */ ++typedef unsigned long long u_longlong_t; /* ANSI unsigned long long type */ /* * constants specific to the xdr "protocol" @@ -35,10 +35,10 @@ diff -uNr libtirpc-1.2.6/tirpc/rpc/xdr.h libtirpc-1.2.6.mod/tirpc/rpc/xdr.h -extern bool_t xdr_u_hyper(XDR *, u_quad_t *); -extern bool_t xdr_longlong_t(XDR *, quad_t *); -extern bool_t xdr_u_longlong_t(XDR *, u_quad_t *); -+extern bool_t xdr_hyper(XDR *, int64_t *); -+extern bool_t xdr_u_hyper(XDR *, uint64_t *); -+extern bool_t xdr_longlong_t(XDR *, int64_t *); -+extern bool_t xdr_u_longlong_t(XDR *, uint64_t *); ++extern bool_t xdr_hyper(XDR *, long long *); ++extern bool_t xdr_u_hyper(XDR *, unsigned long long *); ++extern bool_t xdr_longlong_t(XDR *, long long *); ++extern bool_t xdr_u_longlong_t(XDR *, unsigned long long *); extern u_long xdr_sizeof(xdrproc_t, void *); #ifdef __cplusplus }