From 88c6c00c0caf922a2eeb1c40fe8fc682ea1ee08b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 1 Mar 2019 18:48:03 -0800 Subject: uftrace: Upgrade to 0.9.2 Drop pathes which are upstreamed Signed-off-by: Khem Raj --- .../0001-include-dlfcn.h-for-RTLD_DEFAULT.patch | 39 ------------------ meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb | 46 ---------------------- meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb | 45 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 85 deletions(-) delete mode 100644 meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch delete mode 100644 meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb create mode 100644 meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch deleted file mode 100644 index fe7aac9318..0000000000 --- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cdf7f2e394fcfb93a61f509ae3388f29540a6b35 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Sep 2018 11:56:13 -0700 -Subject: [PATCH] include dlfcn.h for RTLD_DEFAULT - -Fixes -plthook.c:128:41: error: use of undeclared identifier 'RTLD_DEFAULT' - -Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/487] -Signed-off-by: Khem Raj ---- - libmcount/plthook.c | 1 + - utils/debug.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libmcount/plthook.c b/libmcount/plthook.c -index d9d84f0..d54f5e8 100644 ---- a/libmcount/plthook.c -+++ b/libmcount/plthook.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - /* This should be defined before #include "utils.h" */ - #define PR_FMT "mcount" -diff --git a/utils/debug.c b/utils/debug.c -index 2134b09..5460def 100644 ---- a/utils/debug.c -+++ b/utils/debug.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "utils/utils.h" - diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb deleted file mode 100644 index 5963e5d690..0000000000 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Trace and analyze execution of a program written in C/C++" -HOMEPAGE = "https://github.com/namhyung/uftrace" -BUGTRACKER = "https://github.com/namhyung/uftrace/issues" -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "elfutils" -DEPENDS_append_libc-musl = " argp-standalone" - -inherit autotools - -# v0.8.3 -SRCREV = "8b723a6fae2ef30495cd6279774fba9c95cd9c88" -SRC_URI = "git://github.com/namhyung/${BPN} \ - file://0001-include-dlfcn.h-for-RTLD_DEFAULT.patch \ - " -S = "${WORKDIR}/git" - -LDFLAGS_append_libc-musl = " -largp" - -def set_target_arch(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match(r'i.86', arch, re.I): - return 'i386' - elif re.match('armeb', arch, re.I): - return 'arm' - else: - return arch - -EXTRA_UFTRACE_OECONF = "ARCH=${@set_target_arch(d)} \ - with_elfutils=/use/libelf/from/sysroot" - -do_configure() { - ${S}/configure ${EXTRA_UFTRACE_OECONF} -} - -FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*.so" - -COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm)" - -# uftrace supports armv6 and above -COMPATIBLE_HOST_armv4 = 'null' -COMPATIBLE_HOST_armv5 = 'null' diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb new file mode 100644 index 0000000000..4f4016895d --- /dev/null +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb @@ -0,0 +1,45 @@ +SUMMARY = "Trace and analyze execution of a program written in C/C++" +HOMEPAGE = "https://github.com/namhyung/uftrace" +BUGTRACKER = "https://github.com/namhyung/uftrace/issues" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "elfutils" +DEPENDS_append_libc-musl = " argp-standalone" + +inherit autotools + +# v0.9.2 +SRCREV = "66fc1fb973f4a44aecd216541405ffe05196f11e" +SRC_URI = "git://github.com/namhyung/${BPN} \ + " +S = "${WORKDIR}/git" + +LDFLAGS_append_libc-musl = " -largp" + +def set_target_arch(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match(r'i.86', arch, re.I): + return 'i386' + elif re.match('armeb', arch, re.I): + return 'arm' + else: + return arch + +EXTRA_UFTRACE_OECONF = "ARCH=${@set_target_arch(d)} \ + with_elfutils=/use/libelf/from/sysroot" + +do_configure() { + ${S}/configure ${EXTRA_UFTRACE_OECONF} +} + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*.so" + +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm)" + +# uftrace supports armv6 and above +COMPATIBLE_HOST_armv4 = 'null' +COMPATIBLE_HOST_armv5 = 'null' -- cgit 1.2.3-korg