summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-02-21 17:44:26 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:06 +0000
commit1242c7eae70f8d745e50b7414d32c0e0f599d6a8 (patch)
tree0d9b33bb893d46e7563c5000e16c6c93e168d810 /meta/recipes-devtools
parent9b175c060276926d31ae358dac0ad7b30229482c (diff)
downloadpoky-1242c7eae70f8d745e50b7414d32c0e0f599d6a8.tar.gz
strace: 4.15 -> 4.16
* The license cheksum is changed becuase a new line is added: Copyright (C) 2001-2017 The strace developers. * Remove use-asm-sgidefs.h.patch, it doesn't check sgidefs.h any more, it was use for building on mips, I checked it built well. * Update Makefile-ptest.patch and disable-git-version-gen.patch. (From OE-Core rev: 204e0e9916f6acfa02d7a49bf5e33678abb0578d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch13
-rw-r--r--meta/recipes-devtools/strace/strace/disable-git-version-gen.patch18
-rw-r--r--meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch51
-rw-r--r--meta/recipes-devtools/strace/strace_4.16.bb (renamed from meta/recipes-devtools/strace/strace_4.15.bb)7
4 files changed, 19 insertions, 70 deletions
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 <Chong.Lu@windriver.com>
10 2 files changed, 19 insertions(+), 1 deletion(-) 10 2 files changed, 19 insertions(+), 1 deletion(-)
11 11
12diff --git a/configure.ac b/configure.ac 12diff --git a/configure.ac b/configure.ac
13index b2b03c6..464a9dc 100644
13--- a/configure.ac 14--- a/configure.ac
14+++ b/configure.ac 15+++ b/configure.ac
15@@ -36,7 +36,7 @@ AC_INIT([strace], 16@@ -39,7 +39,7 @@ AC_COPYRIGHT([Copyright (C) 1999-2017 The strace developers.])
16 AC_CONFIG_SRCDIR([strace.c]) 17 AC_CONFIG_SRCDIR([strace.c])
17 AC_CONFIG_AUX_DIR([.]) 18 AC_CONFIG_AUX_DIR([.])
18 AC_CONFIG_HEADERS([config.h]) 19 AC_CONFIG_HEADERS([config.h])
19-AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests]) 20-AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests])
20+AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules serial-tests]) 21+AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules serial-tests])
22 AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
21 AM_MAINTAINER_MODE 23 AM_MAINTAINER_MODE
22 AC_CANONICAL_HOST 24 AC_CANONICAL_HOST
23
24diff --git a/tests/Makefile.am b/tests/Makefile.am 25diff --git a/tests/Makefile.am b/tests/Makefile.am
25index 9023029..e1917fa 100644 26index 311d3bb..72f9022 100644
26--- a/tests/Makefile.am 27--- a/tests/Makefile.am
27+++ b/tests/Makefile.am 28+++ b/tests/Makefile.am
28@@ -784,3 +784,21 @@ ksysent.h: $(srcdir)/ksysent.sed 29@@ -960,3 +960,21 @@ $(objects): scno.h
29
30 BUILT_SOURCES = ksysent.h
31 CLEANFILES = ksysent.h $(TESTS:=.tmp) 30 CLEANFILES = ksysent.h $(TESTS:=.tmp)
31
32 include ../scno.am
32+ 33+
33+buildtest-TESTS: $(check_PROGRAMS) $(TESTS) 34+buildtest-TESTS: $(check_PROGRAMS) $(TESTS)
34+ 35+
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]
5 5
6Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 6Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
7 7
8Index: strace-4.10/configure.ac 8diff --git a/configure.ac b/configure.ac
9=================================================================== 9index 7004bd3..b2b03c6 100644
10--- strace-4.10.orig/configure.ac 10--- a/configure.ac
11+++ strace-4.10/configure.ac 11+++ b/configure.ac
12@@ -1,7 +1,7 @@ 12@@ -31,7 +31,7 @@
13 dnl Process this file with autoconf to create configure. Use autoreconf. 13
14 AC_PREREQ(2.57) 14 AC_PREREQ(2.57)
15 AC_INIT([strace], 15 AC_INIT([strace],
16- m4_esyscmd([./git-version-gen .tarball-version]), 16- m4_esyscmd([./git-version-gen .tarball-version]),
17+ m4_esyscmd_s([cat .tarball-version]), 17+ m4_esyscmd_s([cat .tarball-version]),
18 [strace-devel@lists.sourceforge.net]) 18 [strace-devel@lists.sourceforge.net],
19 AC_CONFIG_SRCDIR([strace.c]) 19 [strace],
20 AC_CONFIG_AUX_DIR([.]) 20 [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 @@
1From 2995245d7e3f46e8b3995002995ebd28beca7d55 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Fri, 5 Feb 2016 14:00:00 -0800
4Subject: [PATCH] use <asm/sgidefs.h>
5
6Build fix for MIPS with musl libc.
7
8The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
9but not by musl. Regardless of the libc, the kernel headers provide
10<asm/sgidefs.h> which provides the same definitions, so use that
11instead.
12
13Upstream-Status: Pending
14
15Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
16---
17 configure.ac | 8 ++++----
18 1 file changed, 4 insertions(+), 4 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 1524b9b..287e03d 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -196,20 +196,20 @@ AC_SUBST(arch_mx32)
25 if test "$arch" = mips; then
26 AC_CACHE_CHECK([for _MIPS_SIM], [st_cv__MIPS_SIM],
27 [AC_COMPUTE_INT([st_cv__MIPS_SIM], [_MIPS_SIM],
28- [#include <sgidefs.h>],
29+ [#include <asm/sgidefs.h>],
30 [AC_MSG_ERROR([_MIPS_SIM cannot be determined])])])
31
32 AC_CACHE_CHECK([for MIPS ABI], [st_cv_mips_abi],
33 [AC_COMPILE_IFELSE(
34- [AC_LANG_PROGRAM([[#include <sgidefs.h>]],
35+ [AC_LANG_PROGRAM([[#include <asm/sgidefs.h>]],
36 [[int i[_MIPS_SIM == _MIPS_SIM_ABI32 ? 1 : - 1];]])],
37 [st_cv_mips_abi=o32],
38 [AC_COMPILE_IFELSE(
39- [AC_LANG_PROGRAM([[#include <sgidefs.h>]],
40+ [AC_LANG_PROGRAM([[#include <asm/sgidefs.h>]],
41 [[int i[_MIPS_SIM == _MIPS_SIM_NABI32 ? 1 : - 1];]])],
42 [st_cv_mips_abi=n32],
43 [AC_COMPILE_IFELSE(
44- [AC_LANG_PROGRAM([[#include <sgidefs.h>]],
45+ [AC_LANG_PROGRAM([[#include <asm/sgidefs.h>]],
46 [[int i[_MIPS_SIM == _MIPS_SIM_ABI64 ? 1 : - 1];]])],
47 [st_cv_mips_abi=n64],
48 [st_cv_mips_abi=unknown])])])])
49--
501.9.1
51
diff --git a/meta/recipes-devtools/strace/strace_4.15.bb b/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"
2HOMEPAGE = "http://strace.sourceforge.net" 2HOMEPAGE = "http://strace.sourceforge.net"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "BSD" 4LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" 5LIC_FILES_CHKSUM = "file://COPYING;md5=488acb3aaaf5d14a2e1a852d13668a70"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
8 file://disable-git-version-gen.patch \ 8 file://disable-git-version-gen.patch \
9 file://more-robust-test-for-m32-mx32-compile-support.patch \ 9 file://more-robust-test-for-m32-mx32-compile-support.patch \
10 file://update-gawk-paths.patch \ 10 file://update-gawk-paths.patch \
11 file://use-asm-sgidefs.h.patch \
12 file://Makefile-ptest.patch \ 11 file://Makefile-ptest.patch \
13 file://run-ptest \ 12 file://run-ptest \
14 file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ 13 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 \
16 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
17 " 16 "
18 17
19SRC_URI[md5sum] = "1ff96209fec19914c920608ed0791864" 18SRC_URI[md5sum] = "2873366cac98770efcbed6e748d5ef23"
20SRC_URI[sha256sum] = "c0cdc094d6141fd9dbf6aaad605142d651ae10998b660fda57fc61f7ad583ca9" 19SRC_URI[sha256sum] = "98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef"
21 20
22inherit autotools ptest bluetooth 21inherit autotools ptest bluetooth
23 22