mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
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 <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,39 @@
|
|||||||
|
From cdf7f2e394fcfb93a61f509ae3388f29540a6b35 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
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 <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
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 <sys/mman.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <assert.h>
|
||||||
|
+#include <dlfcn.h>
|
||||||
|
|
||||||
|
/* 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 <assert.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
+#include <dlfcn.h>
|
||||||
|
|
||||||
|
#include "utils/utils.h"
|
||||||
|
|
||||||
+8
-4
@@ -10,15 +10,19 @@ DEPENDS_append_libc-musl = " argp-standalone"
|
|||||||
|
|
||||||
inherit autotools
|
inherit autotools
|
||||||
|
|
||||||
SRCREV = "5af9ff9fa89c340617e52c8ed05798b352a7145c"
|
# v0.8.3
|
||||||
SRC_URI = "git://github.com/namhyung/${BPN}"
|
SRCREV = "8b723a6fae2ef30495cd6279774fba9c95cd9c88"
|
||||||
|
SRC_URI = "git://github.com/namhyung/${BPN} \
|
||||||
|
file://0001-include-dlfcn.h-for-RTLD_DEFAULT.patch \
|
||||||
|
"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
LDFLAGS_append_libc-musl = " -largp"
|
LDFLAGS_append_libc-musl = " -largp"
|
||||||
EXTRA_OECONF = "ARCH=${TARGET_ARCH}"
|
EXTRA_UFTRACE_OECONF = "ARCH=${TARGET_ARCH} \
|
||||||
|
with_elfutils=/use/libelf/from/sysroot"
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
${S}/configure ${EXTRA_OECONF}
|
${S}/configure ${EXTRA_UFTRACE_OECONF}
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES_SOLIBSDEV = ""
|
FILES_SOLIBSDEV = ""
|
||||||
Reference in New Issue
Block a user