diff --git a/.checkpackageignore b/.checkpackageignore index 807cee1a08..b28846cd55 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -869,7 +869,6 @@ package/libmpeg2/0004-fix-sparc.patch lib_patch.Upstream package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch lib_patch.Upstream package/libnfc/0001-autotools-make-example-build-optional.patch lib_patch.Upstream package/libnids/0001-libpcap-use-pkg-config.patch lib_patch.Upstream -package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch lib_patch.Upstream package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch lib_patch.Upstream package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch lib_patch.Upstream package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch lib_patch.Upstream diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch index 57d1c8747d..227769da28 100644 --- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch +++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch @@ -1,4 +1,4 @@ -From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001 +From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Mar 2017 08:52:20 +0200 Subject: [PATCH] Add musl workaround to the libc-compat.h copy @@ -12,26 +12,27 @@ definitions will be needed. See the Buildroot iproute2 patch package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch. Signed-off-by: Baruch Siach ---- -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper -musl fix must go to the kernel first. +Upstream: libc-compat.h is a local copy of a kernel headers. A proper + musl fix must go to the kernel first. +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- include/linux-private/linux/libc-compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h -index 9bed5b6ae4d9..e2562a819464 100644 +index a1599911e7a9..f6df7193b8b4 100644 --- a/include/linux-private/linux/libc-compat.h +++ b/include/linux-private/linux/libc-compat.h -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */ -#if defined(__GLIBC__) +#if 1 - /* Coordinate with glibc netinet/in.h header. */ - #if defined(_NETINET_IN_H) + /* Coordinate with glibc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) -- -2.11.0 +2.43.0