From: akuster808 <akuster808@gmail.com>
To: Khem Raj <raj.khem@gmail.com>, openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH] ltrace: Fix build on mips
Date: Fri, 6 Sep 2019 17:12:24 -0700 [thread overview]
Message-ID: <c74a44cc-b085-e526-eabb-bb56441a5362@gmail.com> (raw)
In-Reply-To: <20190906212513.16415-1-raj.khem@gmail.com>
On 9/6/19 2:25 PM, Khem Raj wrote:
> Newer kernel UAPI headers for mips have moved these needed defines
> around
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
warrior too?
> ---
> .../ltrace/ltrace/include_unistd_nr.patch | 30 +++++++++++++++++++
> meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 +
> 2 files changed, 31 insertions(+)
> create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch
>
> diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch b/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch
> new file mode 100644
> index 0000000000..e4490bbb9e
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch
> @@ -0,0 +1,30 @@
> +kernel headers have restructured mips syscall generation in kernel
> +in recent versions, however, ltrace still has logic to define the
> +syscall numbers based on old logic, this patch includes the legacy
> +UAPI headers to get these defines
> +
> +Fixes errors e.g.
> +../../../../git/sysdeps/linux-gnu/mips/trace.c:138:29: error: '__NR_O32_Linux' undeclared (first use in this function)
> + const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux,
> +
> +Upstream-Status: Pending
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +--- a/sysdeps/linux-gnu/mips/trace.c
> ++++ b/sysdeps/linux-gnu/mips/trace.c
> +@@ -34,6 +34,16 @@
> + #include <assert.h>
> + #include <asm/unistd.h>
> +
> ++#ifndef __NR_O32_Linux
> ++#include <asm/unistd_nr_o32.h>
> ++#endif
> ++#ifndef __NR_N32_Linux
> ++#include <asm/unistd_nr_n64.h>
> ++#endif
> ++#ifndef __NR_N64_Linux
> ++#include <asm/unistd_nr_n32.h>
> ++#endif
> ++
> + #include "backend.h"
> + #include "common.h"
> + #include "debug.h"
> diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
> index 3dc269c80e..ead637cb7e 100644
> --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
> +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
> @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http
> file://0001-mips-plt.c-Delete-include-error.h.patch \
> file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \
> file://0001-hook-Do-not-append-int-to-std-string.patch \
> + file://include_unistd_nr.patch \
> "
> S = "${WORKDIR}/git"
>
next prev parent reply other threads:[~2019-09-07 0:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 21:25 [meta-oe][PATCH] ltrace: Fix build on mips Khem Raj
2019-09-07 0:12 ` akuster808 [this message]
2019-09-07 0:17 ` Khem Raj
2019-09-07 10:21 ` Adrian Bunk
2019-09-07 14:36 ` Khem Raj
2019-09-08 13:08 ` Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c74a44cc-b085-e526-eabb-bb56441a5362@gmail.com \
--to=akuster808@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
--cc=raj.khem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox