From 973578148d343222e8a6a89076f515a4094a7844 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Sep 2018 11:50:16 -0700 Subject: uftrace: Upgrade to 0.8.3 * Deliberately provide a non existing path to with_elfutils so it does not copy libelf.so into its staged install and become a provider for that library while elfutils should be the legit provider and this package should just list it in its rdeps * Fix build with musl Signed-off-by: Khem Raj --- .../0001-include-dlfcn.h-for-RTLD_DEFAULT.patch | 39 ++++++++++++++++++++++ meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb | 35 +++++++++++++++++++ meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb | 31 ----------------- 3 files changed, 74 insertions(+), 31 deletions(-) create mode 100644 meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch create mode 100644 meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb delete mode 100644 meta-oe/recipes-devtools/uftrace/uftrace_0.8.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 new file mode 100644 index 0000000000..fe7aac9318 --- /dev/null +++ b/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch @@ -0,0 +1,39 @@ +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 new file mode 100644 index 0000000000..e377a5c9d5 --- /dev/null +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb @@ -0,0 +1,35 @@ +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" +EXTRA_UFTRACE_OECONF = "ARCH=${TARGET_ARCH} \ + with_elfutils=/use/libelf/from/sysroot" + +do_configure() { + ${S}/configure ${EXTRA_UFTRACE_OECONF} +} + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*.so" + +COMPATIBLE_HOST = "(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.8.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb deleted file mode 100644 index 82b179521c..0000000000 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb +++ /dev/null @@ -1,31 +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 - -SRCREV = "5af9ff9fa89c340617e52c8ed05798b352a7145c" -SRC_URI = "git://github.com/namhyung/${BPN}" -S = "${WORKDIR}/git" - -LDFLAGS_append_libc-musl = " -largp" -EXTRA_OECONF = "ARCH=${TARGET_ARCH}" - -do_configure() { - ${S}/configure ${EXTRA_OECONF} -} - -FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*.so" - -COMPATIBLE_HOST = "(x86_64|aarch64|arm)" - -# uftrace supports armv6 and above -COMPATIBLE_HOST_armv4 = 'null' -COMPATIBLE_HOST_armv5 = 'null' -- cgit 1.2.3-korg