From e52eede3dfd7155e4e016734586b527932d1ef2a Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 5 Dec 2018 17:42:26 +0800 Subject: strace: fix ptest fail and strip ptest host references 1. Add LDFLAGS_FOR_BUILD for strip host reference 2. Revert one previous replace operation for fix ptest fail. refer oe commit: 74b5088f1cc1708db43c33ac2dc7f01f4a4db9c1 Signed-off-by: Changqing Li Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/strace/strace_4.25.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-devtools/strace/strace_4.25.bb b/meta/recipes-devtools/strace/strace_4.25.bb index 58f6cf6e30..028aa71729 100644 --- a/meta/recipes-devtools/strace/strace_4.25.bb +++ b/meta/recipes-devtools/strace/strace_4.25.bb @@ -32,7 +32,7 @@ EXTRA_OECONF += "--enable-mpers=no" CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" TESTDIR = "tests" -PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD)" +PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD|LDFLAGS_FOR_BUILD)" do_install_append() { # We don't ship strace-graph here because it needs perl @@ -47,6 +47,7 @@ do_install_ptest() { oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} install -m 755 ${S}/test-driver ${D}${PTEST_PATH} install -m 644 ${B}/config.h ${D}${PTEST_PATH} + sed -i -e '/^src/s/strace.*[1-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" -- cgit 1.2.3-korg