From 0ca5d09b5a3688ba55daad5cd210569dacf7e72d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 9 Mar 2016 09:43:27 -0500
Subject: sys-apps/findutils: add upstream gnulib fix #576818

---
 .../files/findutils-4.6.0-gnulib-mb.patch          | 36 ++++++++++++++++++++++
 sys-apps/findutils/findutils-4.6.0.ebuild          |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch

(limited to 'sys-apps')

diff --git a/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch b/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch
new file mode 100644
index 000000000000..bd695ffa0f6e
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/576818
+
+From 1f63650823cebf52044df840c81062ccb52163a2 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Mon, 28 Dec 2015 06:27:42 +0900
+Subject: [PATCH] maint: fix operator precedence in mbrtowc test
+
+This is a fix for test breakage introduced by commit 45228d96; the
+equality expression must be parenthesized when negated with '!',
+otherwise we always get:
+
+  test-mbrtowc.c:49: assertion 'ret == (size_t)(-2)' failed
+
+* m4/mbrtowc.m4 (gl_MBRTOWC_EMPTY_INPUT): Negate the entire expression.
+* m4/mbrlen.m4 (gl_MBRLEN_EMPTY_INPUT): Likewise.
+---
+ m4/mbrlen.m4  | 2 +-
+ m4/mbrtowc.m4 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
+index deb9f06..be2e9d6 100644
+--- a/configure
++++ configure
+@@ -569,7 +569,7 @@ changequote([,])dnl
+            int
+            main (void)
+            {
+-             return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
++             return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
+            }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+-- 
+2.6.2
+
diff --git a/sys-apps/findutils/findutils-4.6.0.ebuild b/sys-apps/findutils/findutils-4.6.0.ebuild
index 2c394d01f97a..7808ba9f9692 100644
--- a/sys-apps/findutils/findutils-4.6.0.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0.ebuild
@@ -35,6 +35,8 @@ src_prepare() {
 	# Newer C libraries omit this include from sys/types.h.
 	# https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
 	sed -i '1i#include <sys/sysmacros.h>' gl/lib/mountlist.c || die
+
+	epatch "${FILESDIR}"/${P}-gnulib-mb.patch #576818
 }
 
 src_configure() {
-- 
cgit v1.2.3-65-gdbad