strace: 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.
 - Fix LICENSE fields.

| 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

Signed-off-by: Graham Gower <graham.gower@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/strace/strace-4.5.20/mips-nolargefile.patch b/recipes/strace/strace-4.5.20/mips-nolargefile.patch
new file mode 100644 (file)
index 0000000..6132356
--- /dev/null
+++ b/recipes/strace/strace-4.5.20/mips-nolargefile.patch
@@ -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 */

diff --git a/recipes/strace/strace_4.5.11.bb b/recipes/strace/strace_4.5.11.bb
index 2386b44..f3a4ea6 100644 (file)
--- a/recipes/strace/strace_4.5.11.bb
+++ b/recipes/strace/strace_4.5.11.bb
@@ -1,4 +1,4 @@
-LICENSE = "GPL"
+LICENSE = "BSD"
 SECTION = "console/utils"
 PR = "r2"
 

diff --git a/recipes/strace/strace_4.5.12.bb b/recipes/strace/strace_4.5.12.bb
index 3832091..9bf3e1b 100644 (file)
--- a/recipes/strace/strace_4.5.12.bb
+++ b/recipes/strace/strace_4.5.12.bb
@@ -1,4 +1,4 @@
-LICENSE = "GPL"
+LICENSE = "BSD"
 SECTION = "console/utils"
 PR = "r1"
 

diff --git a/recipes/strace/strace_4.5.14.bb b/recipes/strace/strace_4.5.14.bb
index 8526c91..33a44ad 100644 (file)
--- a/recipes/strace/strace_4.5.14.bb
+++ b/recipes/strace/strace_4.5.14.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
-LICENSE = "GPL"
+LICENSE = "BSD"
 PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \

diff --git a/recipes/strace/strace_4.5.15.bb b/recipes/strace/strace_4.5.15.bb
index ae12146..12f9a96 100644 (file)
--- a/recipes/strace/strace_4.5.15.bb
+++ b/recipes/strace/strace_4.5.15.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
-LICENSE = "GPL"
+LICENSE = "BSD"
 PR = "r1"
 
 # this recipe is missing patches for arm and sh

diff --git a/recipes/strace/strace_4.5.18.bb b/recipes/strace/strace_4.5.18.bb
index de025ea..f5a0719 100644 (file)
--- a/recipes/strace/strace_4.5.18.bb
+++ b/recipes/strace/strace_4.5.18.bb
@@ -1,13 +1,11 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
-LICENSE = "GPL"
+LICENSE = "BSD"
 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 \
           "

diff --git a/recipes/strace/strace_4.5.20.bb b/recipes/strace/strace_4.5.20.bb
index 873ce52..89c5fd3 100644 (file)
--- a/recipes/strace/strace_4.5.20.bb
+++ b/recipes/strace/strace_4.5.20.bb
@@ -1,11 +1,14 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
-LICENSE = "GPL"
-PR = "r0"
+LICENSE = "BSD"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_mips = "1"
+DEFAULT_PREFERENCE_mipsel = "1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
+          file://mips-nolargefile.patch \
           "
 
 inherit autotools