diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 2b76e8a111..876c2d8629 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -10,25 +10,26 @@ Signed-off-by: Chong Lu 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac +index b2b03c6..464a9dc 100644 --- a/configure.ac +++ b/configure.ac -@@ -36,7 +36,7 @@ AC_INIT([strace], +@@ -39,7 +39,7 @@ AC_COPYRIGHT([Copyright (C) 1999-2017 The strace developers.]) AC_CONFIG_SRCDIR([strace.c]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests]) +AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules serial-tests]) + AM_EXTRA_RECURSIVE_TARGETS([check-valgrind]) AM_MAINTAINER_MODE AC_CANONICAL_HOST - diff --git a/tests/Makefile.am b/tests/Makefile.am -index 9023029..e1917fa 100644 +index 311d3bb..72f9022 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -784,3 +784,21 @@ ksysent.h: $(srcdir)/ksysent.sed - - BUILT_SOURCES = ksysent.h +@@ -960,3 +960,21 @@ $(objects): scno.h CLEANFILES = ksysent.h $(TESTS:=.tmp) + + include ../scno.am + +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) + diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 7bc143635f..76daf3a3b7 100644 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -5,16 +5,16 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy -Index: strace-4.10/configure.ac -=================================================================== ---- strace-4.10.orig/configure.ac -+++ strace-4.10/configure.ac -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to create configure. Use autoreconf. +diff --git a/configure.ac b/configure.ac +index 7004bd3..b2b03c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,7 +31,7 @@ + AC_PREREQ(2.57) AC_INIT([strace], - m4_esyscmd([./git-version-gen .tarball-version]), + m4_esyscmd_s([cat .tarball-version]), - [strace-devel@lists.sourceforge.net]) - AC_CONFIG_SRCDIR([strace.c]) - AC_CONFIG_AUX_DIR([.]) + [strace-devel@lists.sourceforge.net], + [strace], + [https://strace.io]) diff --git a/meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch b/meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch deleted file mode 100644 index db83d1130e..0000000000 --- a/meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2995245d7e3f46e8b3995002995ebd28beca7d55 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Fri, 5 Feb 2016 14:00:00 -0800 -Subject: [PATCH] use - -Build fix for MIPS with musl libc. - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1524b9b..287e03d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -196,20 +196,20 @@ AC_SUBST(arch_mx32) - if test "$arch" = mips; then - AC_CACHE_CHECK([for _MIPS_SIM], [st_cv__MIPS_SIM], - [AC_COMPUTE_INT([st_cv__MIPS_SIM], [_MIPS_SIM], -- [#include ], -+ [#include ], - [AC_MSG_ERROR([_MIPS_SIM cannot be determined])])]) - - AC_CACHE_CHECK([for MIPS ABI], [st_cv_mips_abi], - [AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], -+ [AC_LANG_PROGRAM([[#include ]], - [[int i[_MIPS_SIM == _MIPS_SIM_ABI32 ? 1 : - 1];]])], - [st_cv_mips_abi=o32], - [AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], -+ [AC_LANG_PROGRAM([[#include ]], - [[int i[_MIPS_SIM == _MIPS_SIM_NABI32 ? 1 : - 1];]])], - [st_cv_mips_abi=n32], - [AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], -+ [AC_LANG_PROGRAM([[#include ]], - [[int i[_MIPS_SIM == _MIPS_SIM_ABI64 ? 1 : - 1];]])], - [st_cv_mips_abi=n64], - [st_cv_mips_abi=unknown])])])]) --- -1.9.1 - diff --git a/meta/recipes-devtools/strace/strace_4.15.bb b/meta/recipes-devtools/strace/strace_4.16.bb similarity index 84% rename from meta/recipes-devtools/strace/strace_4.15.bb rename to meta/recipes-devtools/strace/strace_4.16.bb index c5983e9c39..b6cd2ac9b9 100644 --- a/meta/recipes-devtools/strace/strace_4.15.bb +++ b/meta/recipes-devtools/strace/strace_4.16.bb @@ -2,13 +2,12 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.sourceforge.net" SECTION = "console/utils" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" +LIC_FILES_CHKSUM = "file://COPYING;md5=488acb3aaaf5d14a2e1a852d13668a70" SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ - file://use-asm-sgidefs.h.patch \ file://Makefile-ptest.patch \ file://run-ptest \ file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ @@ -16,8 +15,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ " -SRC_URI[md5sum] = "1ff96209fec19914c920608ed0791864" -SRC_URI[sha256sum] = "c0cdc094d6141fd9dbf6aaad605142d651ae10998b660fda57fc61f7ad583ca9" +SRC_URI[md5sum] = "2873366cac98770efcbed6e748d5ef23" +SRC_URI[sha256sum] = "98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef" inherit autotools ptest bluetooth