1 files changed, 14 insertions, 11 deletions

diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch b/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
index d096983837..4639532236 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
@@ -1,11 +1,13 @@
 Upstream-Status: Denied [no desire for uclibc support]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
---- systemd-185.orig/configure.ac       2012-06-04 14:15:16.000000000 -0400
-+++ systemd-pam-185/configure.ac        2012-06-21 22:57:10.000000000 -0400
-@@ -63,6 +63,23 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac       2014-03-15 17:53:51.756340454 -0700
++++ git/configure.ac    2014-03-15 18:07:34.888355897 -0700
+@@ -78,6 +78,24 @@
  
- AC_PATH_PROG([M4], [m4])
+ M4_DEFINES=
  
 +# check for few functions not implemented in uClibc
 +
@@ -15,15 +17,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 +
 +AC_MSG_CHECKING([whether %ms format is supported by *scanf])
 +
-+AC_RUN_IFELSE(
-+       [AC_LANG_PROGRAM([[ include <stdio.h> ]],
-+                       [[ char *buf1, *buf2, *buf3, str="1 2.3 abcde" ;
-+                          int rc = sscanf(str, "%ms %ms %ms", &buf1, &buf2, &buf3) ;
-+                          return (rc==3)?0:1;]])],
++AC_LINK_IFELSE(
++       [AC_LANG_PROGRAM([ 
++        #include <stdio.h>
++        ],[
++           char *buf1, *buf2, *buf3, str="1 2.3 abcde" ;
++           int rc = sscanf(str, "%ms %ms %ms", &buf1, &buf2, &buf3) ;
++           return (rc==3)?0:1;])],
 +       [AC_DEFINE([HAVE_MSFORMAT], [1], [Define if %ms format is supported by *scanf.])],
-+       [AC_MSG_RESULT([no])],
 +       [AC_MSG_RESULT([no])])
 +
  # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
  m4_ifdef([GTK_DOC_CHECK], [
- GTK_DOC_CHECK([1.18],[--flavour no-tmpl])
+ GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],