From 20b45274681892cc761bbef87360dc1088d040a1 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 23 Aug 2018 16:11:20 +0800 Subject: strace: 4.23 -> 4.24 Remove backported patch 0001-tests-fix-build-with-fresh-glibc.patch. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-tests-fix-build-with-fresh-glibc.patch | 42 --------------- meta/recipes-devtools/strace/strace_4.23.bb | 63 ---------------------- meta/recipes-devtools/strace/strace_4.24.bb | 62 +++++++++++++++++++++ 3 files changed, 62 insertions(+), 105 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch delete mode 100644 meta/recipes-devtools/strace/strace_4.23.bb create mode 100644 meta/recipes-devtools/strace/strace_4.24.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch b/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch deleted file mode 100644 index ce6e567da0..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bba1b0085f2a2c83839647fee48628ee054aceb7 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" -Date: Sun, 15 Jul 2018 22:14:29 +0000 -Subject: [PATCH] tests: fix build with fresh glibc - -Workaround additional incompatibility between and - introduced by glibc-2.27.9000-566-gfd70af4. - -* tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion -of to avoid conflicts between definitions provided by the -linux kernel headers and the GNU libc. - -Upstream-Status: Backport [https://gitlab.com/strace/strace/commit/3dbffb7] -Signed-off-by: Khem Raj ---- - - tests/xstatx.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/xstatx.c b/tests/xstatx.c -index 7fb9326..441f4a8 100644 ---- a/tests/xstatx.c -+++ b/tests/xstatx.c -@@ -64,10 +64,14 @@ typedef off_t libc_off_t; - - # define stat libc_stat - # define stat64 libc_stat64 -+# define statx libc_statx -+# define statx_timestamp libc_statx_timestamp - # include - # include --# undef stat -+# undef statx_timestamp -+# undef statx - # undef stat64 -+# undef stat - - # undef st_atime - # undef st_mtime --- -2.18.0 - diff --git a/meta/recipes-devtools/strace/strace_4.23.bb b/meta/recipes-devtools/strace/strace_4.23.bb deleted file mode 100644 index d30d440abc..0000000000 --- a/meta/recipes-devtools/strace/strace_4.23.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "System call tracing tool" -HOMEPAGE = "http://strace.io" -SECTION = "console/utils" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=6ddb91734b9c705f3e87362e97e5f64b" - -SRC_URI = "https://strace.io/files/${PV}/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://Makefile-ptest.patch \ - file://run-ptest \ - file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ - file://mips-SIGEMT.patch \ - file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ - file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ - file://0001-tests-fix-build-with-fresh-glibc.patch \ - " -SRC_URI[md5sum] = "fad4bba0947553cef34d46a9fd78f039" -SRC_URI[sha256sum] = "7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad" - -inherit autotools ptest bluetooth - -PACKAGECONFIG_class-target ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ -" - -PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" -PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" - -EXTRA_OECONF += "--enable-mpers=no" - -CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" - -TESTDIR = "tests" - -do_install_append() { - # We don't ship strace-graph here because it needs perl - rm ${D}${bindir}/strace-graph -} - -do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} - sed -i -e '/^src/s/strace.*[1-9]/ptest/' \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${RECIPE_SYSROOT}::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -e '/^DEB_CHANGELOGTIME/d' \ - -e '/^RPM_CHANGELOGTIME/d' \ - ${D}/${PTEST_PATH}/${TESTDIR}/Makefile -} - -RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" - -BBCLASSEXTEND = "native" -TOOLCHAIN = "gcc" diff --git a/meta/recipes-devtools/strace/strace_4.24.bb b/meta/recipes-devtools/strace/strace_4.24.bb new file mode 100644 index 0000000000..e6f7e9cba7 --- /dev/null +++ b/meta/recipes-devtools/strace/strace_4.24.bb @@ -0,0 +1,62 @@ +SUMMARY = "System call tracing tool" +HOMEPAGE = "http://strace.io" +SECTION = "console/utils" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ddb91734b9c705f3e87362e97e5f64b" + +SRC_URI = "https://strace.io/files/${PV}/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://Makefile-ptest.patch \ + file://run-ptest \ + file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ + file://mips-SIGEMT.patch \ + 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] = "8780136849c85acf76ad3a522aa4462a" +SRC_URI[sha256sum] = "1f4e59fc1edfa2bfb4adf2a748623dc25b105ec79713dd84404199f91b0b0634" + +inherit autotools ptest bluetooth + +PACKAGECONFIG_class-target ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ +" + +PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" +PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" + +EXTRA_OECONF += "--enable-mpers=no" + +CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" + +TESTDIR = "tests" + +do_install_append() { + # We don't ship strace-graph here because it needs perl + rm ${D}${bindir}/strace-graph +} + +do_compile_ptest() { + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} + sed -i -e '/^src/s/strace.*[1-9]/ptest/' \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${RECIPE_SYSROOT}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -e '/^DEB_CHANGELOGTIME/d' \ + -e '/^RPM_CHANGELOGTIME/d' \ + ${D}/${PTEST_PATH}/${TESTDIR}/Makefile +} + +RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" + +BBCLASSEXTEND = "native" +TOOLCHAIN = "gcc" -- cgit 1.2.3-korg