1 files changed, 10 insertions, 12 deletions

diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
index 756cd8bb82..3d4913d68e 100644
--- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
+++ b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
@@ -22,25 +22,23 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
  m4/mpers.m4 | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/m4/mpers.m4 b/m4/mpers.m4
-index 1fe8a8e..d72c717 100644
---- a/m4/mpers.m4
-+++ b/m4/mpers.m4
-@@ -53,12 +53,14 @@ case "$arch" in
-        CFLAGS="$CFLAGS CFLAG $IFLAG"
-        AC_CACHE_CHECK([for CFLAG compile support], [st_cv_cc],
+Index: strace-4.22/m4/mpers.m4
+===================================================================
+--- strace-4.22.orig/m4/mpers.m4
++++ strace-4.22/m4/mpers.m4
+@@ -108,6 +108,7 @@ case "$arch" in
+        CFLAGS="$CFLAGS MPERS_CFLAGS $IFLAG"
+        AC_CACHE_CHECK([for mpers_name personality compile support], [st_cv_cc],
                 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
 +                                                    #include <sys/syscall.h>
                                                      int main(){return 0;}]])],
                                    [st_cv_cc=yes],
                                    [st_cv_cc=no])])
-        if test $st_cv_cc = yes; then
-                AC_CACHE_CHECK([for CFLAG runtime support], [st_cv_runtime],
+@@ -115,6 +116,7 @@ case "$arch" in
+                AC_CACHE_CHECK([for mpers_name personality runtime support],
+                        [st_cv_runtime],
                         [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
 +                                                        #include <sys/syscall.h>
                                                          int main(){return 0;}]])],
                                        [st_cv_runtime=yes],
                                        [st_cv_runtime=no],
--- 
-1.9.1
-