| Message ID | 20190906212513.16415-1-raj.khem@gmail.com |
|---|---|
| State | Accepted |
| Commit | 720a2ffe85cff1d24012b14e9ab47a6a239cd9eb |
| Headers | show |
| Series | [oe,meta-oe] ltrace: Fix build on mips | expand |
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" > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
I think yes On Fri, Sep 6, 2019 at 5:12 PM akuster808 <akuster808@gmail.com> wrote: > > > 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" > > > > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
On Fri, Sep 06, 2019 at 05:12:24PM -0700, akuster808 wrote: > 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? >... No, this is not a problem with the UAPI headers in warrior. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
On Sat, Sep 7, 2019 at 3:21 AM Adrian Bunk <bunk@stusta.de> wrote: > > On Fri, Sep 06, 2019 at 05:12:24PM -0700, akuster808 wrote: > > 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? > >... > > No, this is not a problem with the UAPI headers in warrior. anything that's using kernel 5.0+ UAPI headers has this problem and warrior is using 5.0 for linux-libc headers. see [1] [1] https://github.com/torvalds/linux/commit/9bcbf97c62931f27ab2c52f0848dec0cd48aee78 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
On Sat, Sep 07, 2019 at 07:36:04AM -0700, Khem Raj wrote: > On Sat, Sep 7, 2019 at 3:21 AM Adrian Bunk <bunk@stusta.de> wrote: > > > > On Fri, Sep 06, 2019 at 05:12:24PM -0700, akuster808 wrote: > > > 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? > > >... > > > > No, this is not a problem with the UAPI headers in warrior. > > anything that's using kernel 5.0+ UAPI headers has this problem and > warrior is using 5.0 > for linux-libc headers. see [1] > > [1] https://github.com/torvalds/linux/commit/9bcbf97c62931f27ab2c52f0848dec0cd48aee78 Thanks for correcting me, I was looking at the wrong commit. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
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"
Newer kernel UAPI headers for mips have moved these needed defines around Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../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 -- 2.23.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel