From 2beb24d773d4ba34eb8812b72cdaf557c54cd036 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 5 Oct 2021 20:40:27 +0200 Subject: [PATCH] libnl: fix build with ndk-r23 --- packages/libnl/build.sh | 1 + packages/libnl/socket.h.patch | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 packages/libnl/socket.h.patch diff --git a/packages/libnl/build.sh b/packages/libnl/build.sh index bf4b0a083..577e5e14e 100644 --- a/packages/libnl/build.sh +++ b/packages/libnl/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of libraries providing APIs to netlink protoc TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.5.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/thom311/libnl/releases/download/libnl${TERMUX_PKG_VERSION//./_}/libnl-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libnl/socket.h.patch b/packages/libnl/socket.h.patch new file mode 100644 index 000000000..4787b4baf --- /dev/null +++ b/packages/libnl/socket.h.patch @@ -0,0 +1,24 @@ +--- ../socket.h.orig 2021-10-05 20:33:54.147771599 +0200 ++++ ./include/linux-private/linux/socket.h 2021-10-05 20:37:22.881231039 +0200 +@@ -2,21 +2,7 @@ + #ifndef _LINUX_SOCKET_H + #define _LINUX_SOCKET_H + +-/* +- * Desired design of maximum size and alignment (see RFC2553) +- */ +-#define _K_SS_MAXSIZE 128 /* Implementation specific max size */ +-#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *)) +- /* Implementation specific desired alignment */ + + typedef unsigned short __kernel_sa_family_t; + +-struct __kernel_sockaddr_storage { +- __kernel_sa_family_t ss_family; /* address family */ +- /* Following field(s) are implementation specific */ +- char __data[_K_SS_MAXSIZE - sizeof(unsigned short)]; +- /* space to achieve desired size, */ +- /* _SS_MAXSIZE value minus size of ss_family */ +-} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ +- + #endif /* _LINUX_SOCKET_H */