Signed-off-by: Andrew Jeffery <[email protected]> --- ...ract-over-user_regs_struct-name-which-dif.patch | 69 ++++++++++++++++++++++ .../python/python-pyflame_1.6.6.bb | 2 + 2 files changed, 71 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-pyflame/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch
diff --git a/meta-python/recipes-devtools/python/python-pyflame/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch b/meta-python/recipes-devtools/python/python-pyflame/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch new file mode 100644 index 000000000000..09c4394c2a4b --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyflame/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch @@ -0,0 +1,69 @@ +From 2ef124e235a47dd4742813cf80e11a89cf4f02f8 Mon Sep 17 00:00:00 2001 +From: Andrew Jeffery <[email protected]> +Date: Thu, 3 May 2018 12:35:31 +0930 +Subject: [PATCH] ptrace: Abstract over user_regs_struct name, which differs on + ARM32 + +Signed-off-by: Andrew Jeffery <[email protected]> +--- + src/ptrace.cc | 6 +++--- + src/ptrace.h | 10 ++++++++-- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/src/ptrace.cc b/src/ptrace.cc +index 485f58e4d82e..610fabb3b8e8 100644 +--- a/src/ptrace.cc ++++ b/src/ptrace.cc +@@ -122,8 +122,8 @@ void PtraceInterrupt(pid_t pid) { + DoWait(pid); + } + +-struct user_regs_struct PtraceGetRegs(pid_t pid) { +- struct user_regs_struct regs; ++user_regs_struct PtraceGetRegs(pid_t pid) { ++ user_regs_struct regs; + if (ptrace(PTRACE_GETREGS, pid, 0, ®s)) { + std::ostringstream ss; + ss << "Failed to PTRACE_GETREGS: " << strerror(errno); +@@ -132,7 +132,7 @@ struct user_regs_struct PtraceGetRegs(pid_t pid) { + return regs; + } + +-void PtraceSetRegs(pid_t pid, struct user_regs_struct regs) { ++void PtraceSetRegs(pid_t pid, user_regs_struct regs) { + if (ptrace(PTRACE_SETREGS, pid, 0, ®s)) { + std::ostringstream ss; + ss << "Failed to PTRACE_SETREGS: " << strerror(errno); +diff --git a/src/ptrace.h b/src/ptrace.h +index 7083be1c4dfd..d6af8bf9f83a 100644 +--- a/src/ptrace.h ++++ b/src/ptrace.h +@@ -23,6 +23,12 @@ + + #include "./config.h" + ++#if defined(__arm__) ++typedef struct user_regs user_regs_struct; ++#else ++typedef struct user_regs_struct user_regs_struct; ++#endif ++ + namespace pyflame { + + int DoWait(pid_t pid, int options = 0); +@@ -39,10 +45,10 @@ void PtraceSeize(pid_t pid); + void PtraceInterrupt(pid_t pid); + + // get regs from a process +-struct user_regs_struct PtraceGetRegs(pid_t pid); ++user_regs_struct PtraceGetRegs(pid_t pid); + + // set regs in a process +-void PtraceSetRegs(pid_t pid, struct user_regs_struct regs); ++void PtraceSetRegs(pid_t pid, user_regs_struct regs); + + // poke a long word into an address + void PtracePoke(pid_t pid, unsigned long addr, long data); +-- +2.14.1 + diff --git a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb b/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb index c902e121231b..2edd708506e3 100644 --- a/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb +++ b/meta-python/recipes-devtools/python/python-pyflame_1.6.6.bb @@ -3,3 +3,5 @@ require python-pyflame.inc SRC_URI = "https://github.com/uber/pyflame/archive/v${PV}.tar.gz"; SRC_URI[md5sum] = "53d5822e5be371303e217a68ea9ea3e5" SRC_URI[sha256sum] = "03723509c037a994585e81e4a9c6d8e4fed87b486e23edd8d355a7bcc009bf79" + +SRC_URI += "file://0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch" -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
