[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6986/8267] diffutils: upgrade to 3.6

[Emmanuele Bassi <ebassi src gnome org>]

commit dba27e245e37eb1ffb0c086a0d709deda29eee12
Author: Chen Qi <Qi Chen windriver com>
Date:   Mon Jul 24 17:51:09 2017 +0800

    diffutils: upgrade to 3.6
    
    diffutils-3.5-gcc7.patch is removed as it's merged in this version.
    
    do_configure_prepend is removed to solve the following configure error.
    
      error: possibly undefined macro: gl_TYPE_WINT_T_PREREQ
    
    A workaround patch is made to fix the following compilation error for glibc.
    
      error: dereferencing pointer to incomplete type 'const struct rpl_option'
    
    (From OE-Core rev: 0c09f9f5700696670b2a9d0466124309100eb296)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../diffutils-3.5/diffutils-3.5-gcc7.patch         |  228 --------------------
 ...need_charset_alias-when-building-for-musl.patch |    0
 .../0001-explicitly-disable-replacing-getopt.patch |   30 +++
 .../{diffutils-3.5 => diffutils-3.6}/run-ptest     |    0
 .../{diffutils_3.5.bb => diffutils_3.6.bb}         |   14 +-
 5 files changed, 34 insertions(+), 238 deletions(-)
---
diff --git 
a/meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch 
b/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from 
meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to 
meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch 
b/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
new file mode 100644
index 0000000..351f87c
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
@@ -0,0 +1,30 @@
+Subject: explicitly disable replacing getopt
+
+Explicitly disable replacing getopt to avoid compilation error like below.
+
+  xstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option'
+
+Upstream-Status: Inappropriate [workaround]
+Signed-off-by: Chen Qi <Qi Chen windriver com>
+---
+ m4/getopt.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/getopt.m4 b/m4/getopt.m4
+index 3ebc7b7..8934426 100644
+--- a/m4/getopt.m4
++++ b/m4/getopt.m4
+@@ -22,8 +22,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX],
+     fi
+   ])
+   if test $REPLACE_GETOPT = 1; then
+-    dnl Arrange for getopt.h to be created.
+-    gl_GETOPT_SUBSTITUTE_HEADER
++    dnl Explicitly disable replacing getopt
++    :
+   fi
+ ])
+ 
+-- 
+2.11.0
+
diff --git a/meta/recipes-extended/diffutils/diffutils-3.5/run-ptest 
b/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest
similarity index 100%
rename from meta/recipes-extended/diffutils/diffutils-3.5/run-ptest
rename to meta/recipes-extended/diffutils/diffutils-3.6/run-ptest
diff --git a/meta/recipes-extended/diffutils/diffutils_3.5.bb 
b/meta/recipes-extended/diffutils/diffutils_3.6.bb
similarity index 66%
rename from meta/recipes-extended/diffutils/diffutils_3.5.bb
rename to meta/recipes-extended/diffutils/diffutils_3.6.bb
index a4fc27b..a2ea484 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.5.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.6.bb
@@ -5,24 +5,18 @@ require diffutils.inc
 
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
-           file://diffutils-3.5-gcc7.patch \
            file://run-ptest \
 "
-SRC_URI[md5sum] = "569354697ff1cfc9a9de3781361015fa"
-SRC_URI[sha256sum] = "dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533"
+SRC_URI_append_libc-glibc = " file://0001-explicitly-disable-replacing-getopt.patch"
+
+SRC_URI[md5sum] = "07cf286672ced26fba54cd0313bdc071"
+SRC_URI[sha256sum] = "d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6"
 
 EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix"
 
 # Fix "Argument list too long" error when len(TMPDIR) = 410
 acpaths = "-I ./m4"
 
-do_configure_prepend () {
-       # Need to remove gettext macros with weird mix of versions
-       for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 
po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
-               rm -f ${S}/m4/$i
-       done
-}
-
 inherit ptest
 
 do_install_ptest() {