[OE-core] [PATCH 5/5] glibc: Fix up minimal build with libc-libm

[Richard Purdie]

On Fri, 2015-01-09 at 14:51 -0800, Saul Wold wrote:
> This addresses 2 issues discovered trying to build a minimal libc with
> libm option.  By default nscd was always being built and without inet
> enabled there were missing symbols.
> 
> The patch got updated changing initgroups to become part of the INET
> group. Newer version of quilt added function information.
> 
> [YOCTO #7108]
> 
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> ---
>  .../glibc/glibc/eglibc-use-option-groups.patch     | 1379 ++++++++++----------
>  meta/recipes-core/glibc/glibc_2.20.bb              |    3 +
>  2 files changed, 693 insertions(+), 689 deletions(-)
> 
> diff --git a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch
> index 7136253..7be9b06 100644
> --- a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch
> +++ b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch
> @@ -4,8 +4,8 @@ Upstream-Status: Pending
>  
>  Index: git/argp/argp-fmtstream.c
>  ===================================================================
> ---- git.orig/argp/argp-fmtstream.c	2014-08-29 20:00:42.976070587 -0700
> -+++ git/argp/argp-fmtstream.c	2014-08-29 20:01:15.188070587 -0700
> +--- git.orig/argp/argp-fmtstream.c
> ++++ git/argp/argp-fmtstream.c
>  @@ -42,6 +42,7 @@
>   #ifdef _LIBC
>   # include <wchar.h>
> @@ -14,7 +14,7 @@ Index: git/argp/argp-fmtstream.c
>   # define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
>   #endif
>   
> -@@ -100,7 +101,11 @@
> +@@ -100,7 +101,11 @@ __argp_fmtstream_free (argp_fmtstream_t
>     __argp_fmtstream_update (fs);
>     if (fs->p > fs->buf)

Is there a way we could filter out the noise in the patch or move it
into a separate commit? Its rather horrid to review this and I don't
particularly want to backport the noise to dizzy either...

Cheers,

Richard