strace_4.5.20.bb: Fix build on mips{, el} when DISTRO_FEATURES lacks "largefile".
PATCH v2 1/1 strace_4.5.20.bb: Fix build on mips{, el} when DISTRO_FEATURES lacks "largefile".
While here, make 4.5.20 the default for mips instead of 4.5.18.
| mipsel-oe-linux-uclibc-gcc -march=mips32 -Wall -isystem/mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -L/mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib -Wl,-rpath-link,/mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib -Wl,-O1 -o strace strace.o syscall.o count.o util.o desc.o file.o ipc.o io.o ioctl.o mem.o net.o process.o bjm.o quota.o resource.o signal.o sock.o system.o term.o time.o proc.o scsi.o stream.o | syscall.o:(.data.rel.ro+0x14904): undefined reference to `sys_truncate64' | syscall.o:(.data.rel.ro+0x14918): undefined reference to `sys_ftruncate64' | syscall.o:(.data.rel.ro+0x149a4): undefined reference to `sys_getdents64' | syscall.o:(.data.rel.ro+0x14c74): undefined reference to `sys_statfs64' | syscall.o:(.data.rel.ro+0x14c88): undefined reference to `sys_fstatfs64' | collect2: ld returned 1 exit status | make[1]: *** [strace] Error 1
--- .../strace/strace-4.5.20/mips-nolargefile.patch | 41 ++++++++++++++++++++ recipes/strace/strace_4.5.18.bb | 2 - recipes/strace/strace_4.5.20.bb | 4 ++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 recipes/strace/strace-4.5.20/mips-nolargefile.patch
recipes/strace/strace-4.5.20/mips-nolargefile.patch new file +41 -0
@@ -0,0 +1,41 @@ +--- strace-4.5.20/linux/mips/syscallent.h.orig 2010-11-23 13:25:49.000000000 +1030 ++++ strace-4.5.20/linux/mips/syscallent.h 2010-11-23 13:28:23.000000000 +1030 +@@ -4213,15 +4213,24 @@ + { 0, 0, printargs, "SYS_4208" }, /* 4208 */ + { 0, 0, printargs, "SYS_4209" }, /* 4209 */ + { 6, 0, sys_mmap, "mmap" }, /* 4210 */ ++#ifdef _LFS64_LARGEFILE + { 4, TF, sys_truncate64, "truncate64" }, /* 4211 */ + { 4, TD, sys_ftruncate64, "ftruncate64" }, /* 4212 */ ++#else ++ { 4, TF, printargs, "truncate64" }, /* 4211 */ ++ { 4, TD, printargs, "ftruncate64" }, /* 4212 */ ++#endif + { 2, TF, printargs, "stat64" }, /* 4213 */ + { 2, TF, sys_lstat64, "lstat64" }, /* 4214 */ + { 2, TD, sys_fstat64, "fstat64" }, /* 4215 */ + { 2, TF, sys_pivotroot, "pivot_root" }, /* 4216 */ + { 3, 0, printargs, "mincore" }, /* 4217 */ + { 3, 0, sys_madvise, "madvise" }, /* 4218 */ ++#ifdef _LFS64_LARGEFILE + { 3, TF, sys_getdents64, "getdents64" }, /* 4219 */ ++#else ++ { 3, TF, printargs, "getdents64" }, /* 4219 */ ++#endif + { 3, TD, sys_fcntl, "fcntl64" }, /* 4220 */ + { 0, 0, printargs, "SYS_4221" }, /* 4221 */ + { 0, 0, printargs, "gettid" }, /* 4222 */ +@@ -4257,8 +4266,13 @@ + { 1, 0, printargs, "set_tid_address"}, /* 4252 */ + { 0, 0, sys_restart_syscall, "restart_syscall"}, /* 4253 */ + { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 4254 */ ++#ifdef _LFS64_LARGEFILE + { 3, TF, sys_statfs64, "statfs64" }, /* 4255 */ + { 2, TD, sys_fstatfs64, "fstatfs64" }, /* 4256 */ ++#else ++ { 3, TF, printargs, "statfs64" }, /* 4255 */ ++ { 2, TD, printargs, "fstatfs64" }, /* 4256 */ ++#endif + { 3, 0, sys_timer_create, "timer_create" }, /* 4257 */ + { 4, 0, sys_timer_settime, "timer_settime" }, /* 4258 */ + { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 4259 */
recipes/strace/strace_4.5.18.bb +0 -2
@@ -6,8 +6,6 @@ PR = "r2" # this recipe is missing patches for arm and sh DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_avr32 = "1" -DEFAULT_PREFERENCE_mips = "1" -DEFAULT_PREFERENCE_mipsel = "1" SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ "
recipes/strace/strace_4.5.20.bb +4 -0
@@ -4,9 +4,13 @@ LICENSE = "GPL" PR = "r0" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mips = "1" +DEFAULT_PREFERENCE_mipsel = "1" SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ " +SRC_URI_append_mipsel += " file://mips-nolargefile.patch " +SRC_URI_append_mips += " file://mips-nolargefile.patch " inherit autotools
Signature · 1 line
1.7.1
Quoted 5 lines · Graham Gower
recipes/strace/strace_4.5.20.bb +0
-0
recipes/strace/strace_4.5.20.bb LICENSE = "GPL" · line 13
Quoted 10 lines
recipes/strace/strace_4.5.20.bb +4
-0@@ -4,9 +4,13 @@ LICENSE = "GPL" PR = "r0" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mips = "1" +DEFAULT_PREFERENCE_mipsel = "1" SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ " +SRC_URI_append_mipsel += " file://mips-nolargefile.patch " +SRC_URI_append_mips += " file://mips-nolargefile.patch "
I think it would be better to apply this patch unconditionally, because it doesn't impose negative effects on other archs, and future patches which might only get compile-tested on other archs must make sure that mips-nolargefile.patch still applies.
Regards,
Andreas
Quoted 12 lines · Andreas Oberritter
Quoted 11 lines · Graham Gower
recipes/strace/strace_4.5.20.bb +2
-0@@ -4,9 +4,13 @@ LICENSE = "GPL" PR = "r0" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mips = "1" +DEFAULT_PREFERENCE_mipsel = "1"
Quoted 9 lines
recipes/strace/strace_4.5.20.bb LICENSE = "GPL" · line 13
Quoted 4 lines
recipes/strace/strace_4.5.20.bb +2
-0SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ " +SRC_URI_append_mipsel += " file://mips-nolargefile.patch " +SRC_URI_append_mips += " file://mips-nolargefile.patch "I think it would be better to apply this patch unconditionally, because it doesn't impose negative effects on other archs, and future patches which might only get compile-tested on other archs must make sure that mips-nolargefile.patch still applies.
Albeit, the correct syntax would be:SRC_URI_append_mipsel = " file://mips-nolargefile.patch"
mixing `vname_append` with `+=` (was: [PATCH v2] strace_4.5.20.bb: Fix build on mips{, el} when DISTRO_FEATURES lacks "largefile".)
Am Dienstag, den 23.11.2010, 13:44 +0100 schrieb Andreas Oberritter:
Quoted 23 lines · Andreas Oberritter
Quoted 12 lines · Graham Gower
Quoted 11 lines
recipes/strace/strace_4.5.20.bb +2
-0@@ -4,9 +4,13 @@ LICENSE = "GPL" PR = "r0" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mips = "1" +DEFAULT_PREFERENCE_mipsel = "1"Quoted 9 lines
recipes/strace/strace_4.5.20.bb LICENSE = "GPL" · line 13
Quoted 4 lines
recipes/strace/strace_4.5.20.bb +2
-0SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ " +SRC_URI_append_mipsel += " file://mips-nolargefile.patch " +SRC_URI_append_mips += " file://mips-nolargefile.patch "I think it would be better to apply this patch unconditionally, because it doesn't impose negative effects on other archs, and future patches which might only get compile-tested on other archs must make sure that mips-nolargefile.patch still applies.
Quoted 2 lines
Albeit, the correct syntax would be:
SRC_URI_append_mipsel= " file://mips-nolargefile.patch"
Not necessarily. Quoting the user manual [1].
Note that the appended information is a variable itself, and therefore it's possible to use += or =+ to assign variables to the _append information:
Although I do not know about the advantages or disadvantages.
Thanks,
Paul
[1] http://docs.openembedded.org/usermanual/usermanual.html#recipes_syntax