diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2018-05-03 20:36:49 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-15 10:00:28 +0100 |
| commit | 7ab51c619697ad64d69ecf77449c43fe59c3290c (patch) | |
| tree | c893c58d454cfa867fb7c98a70f43550cbab27eb | |
| parent | c76f1fe05661bcdff1b59694cba986bc5feaf1c8 (diff) | |
| download | openembedded-core-7ab51c619697ad64d69ecf77449c43fe59c3290c.tar.gz | |
strace: Upgrade to 4.22
License-Update: Update Copyright years
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/strace/strace/disable-git-version-gen.patch | 12 | ||||
| -rw-r--r-- | meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-devtools/strace/strace_4.22.bb (renamed from meta/recipes-devtools/strace/strace_4.20.bb) | 11 |
3 files changed, 23 insertions, 22 deletions
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 76daf3a3b7..47b1139c53 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 <armccurdy@gmail.com> -diff --git a/configure.ac b/configure.ac -index 7004bd3..b2b03c6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,7 +31,7 @@ +Index: strace-4.22/configure.ac +=================================================================== +--- strace-4.22.orig/configure.ac ++++ strace-4.22/configure.ac +@@ -32,7 +32,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], + [strace-devel@lists.strace.io], [strace], [https://strace.io]) 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 - diff --git a/meta/recipes-devtools/strace/strace_4.20.bb b/meta/recipes-devtools/strace/strace_4.22.bb index 869c12f65a..196c9d8587 100644 --- a/meta/recipes-devtools/strace/strace_4.20.bb +++ b/meta/recipes-devtools/strace/strace_4.22.bb @@ -2,7 +2,7 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=f132b4d2adfccc63da4139a609367711" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ddb91734b9c705f3e87362e97e5f64b" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ @@ -15,12 +15,15 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ " - -SRC_URI[md5sum] = "f2271ab0fac49ebee9cbd7f3469227cb" -SRC_URI[sha256sum] = "5bf3148dd17306a42566f7da17368fdd781afa147db05ea63a4ca2b50f58c523" +SRC_URI[md5sum] = "7a2a7d7715da6e6834bc65bd09bace1c" +SRC_URI[sha256sum] = "068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d" inherit autotools ptest bluetooth +EXTRA_OECONF += "--enable-mpers=no" + +CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" + RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" PACKAGECONFIG_class-target ??= "\ |