[oe-commits] org.oe.dev ltrace: add mvista-toolchain specific version, fix building w/ gnueabi

[mickeyl commit]

ltrace: add mvista-toolchain specific version, fix building w/ gnueabi

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9a707a5097109b9a1f2ce8a8f2945ef2d611a1d6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9a707a5097109b9a1f2ce8a8f2945ef2d611a1d6
Files:
1
packages/ltrace/files
packages/ltrace/files/mvc-toolchain.patch
packages/ltrace/ltrace-mvc_0.3.36.bb
packages/ltrace/ltrace_0.3.36.bb
Diffs:

#
# mt diff -r4569ccd3ba47dcb3b8065262d72969eb75349a14 -r9a707a5097109b9a1f2ce8a8f2945ef2d611a1d6
#
# 
# 
# add_dir "packages/ltrace/files"
# 
# add_file "packages/ltrace/files/mvc-toolchain.patch"
#  content [ddc6c40dce31bc65be53e8c70eb786877b0ab1e9]
# 
# add_file "packages/ltrace/ltrace-mvc_0.3.36.bb"
#  content [a6c18024463e355a0d7d1fab037465918257027a]
# 
# patch "packages/ltrace/ltrace_0.3.36.bb"
#  from [955542695fd39d0e5a93933ab52e420dc3aa4925]
#    to [ae59fdad2928629d06ef42d04d22f32461234850]
# 
============================================================
--- packages/ltrace/files/mvc-toolchain.patch	ddc6c40dce31bc65be53e8c70eb786877b0ab1e9
+++ packages/ltrace/files/mvc-toolchain.patch	ddc6c40dce31bc65be53e8c70eb786877b0ab1e9
@@ -0,0 +1,32 @@
+diff -ru ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/arch.h
+--- ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h	2004-11-09 20:25:15.000000000 +0800
++++ ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/arch.h	2005-12-17 02:00:34.000000000 +0800
+@@ -1,4 +1,5 @@
+-#define BREAKPOINT_VALUE { 0x01, 0x00, 0x9f, 0xef }
++#define BREAKPOINT_VALUE { 0xfe, 0xde, 0xff, 0xe7}
++
+ #define BREAKPOINT_LENGTH 4
+ #define DECR_PC_AFTER_BREAK 0
+ 
+diff -ru ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/plt.c
+--- ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c	2004-11-09 20:25:15.000000000 +0800
++++ ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/plt.c	2005-12-19 08:08:54.000000000 +0800
+@@ -5,5 +5,5 @@
+ GElf_Addr
+ arch_plt_sym_val (struct ltelf *lte, size_t ndx, GElf_Rela *rela)
+ {
+-  return lte->plt_addr + 20 + ndx * 12;
++  return lte->plt_addr + 16 + ndx * 16;
+ }
+diff -ru ltrace-0.3.36/wait_for_something.c ltrace-0.3.36-mvc/wait_for_something.c
+--- ltrace-0.3.36/wait_for_something.c	2004-06-14 23:55:50.000000000 +0800
++++ ltrace-0.3.36-mvc/wait_for_something.c	2005-12-17 02:21:15.000000000 +0800
+@@ -82,7 +82,7 @@
+ 		event.thing = LT_EV_UNKNOWN;
+ 		return &event;
+ 	}
+-	if (WSTOPSIG(status) != SIGTRAP) {
++	if (WSTOPSIG(status) != SIGTRAP && WSTOPSIG(status) != SIGILL) {
+ 		event.thing = LT_EV_SIGNAL;
+ 		event.e_un.signum = WSTOPSIG(status);
+ 		return &event;
============================================================
--- packages/ltrace/ltrace-mvc_0.3.36.bb	a6c18024463e355a0d7d1fab037465918257027a
+++ packages/ltrace/ltrace-mvc_0.3.36.bb	a6c18024463e355a0d7d1fab037465918257027a
@@ -0,0 +1,5 @@
+require ltrace_${PV}.bb
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://mvc-toolchain.patch;patch=1"
============================================================
--- packages/ltrace/ltrace_0.3.36.bb	955542695fd39d0e5a93933ab52e420dc3aa4925
+++ packages/ltrace/ltrace_0.3.36.bb	ae59fdad2928629d06ef42d04d22f32461234850
@@ -1,14 +1,12 @@ LICENSE = "GPL"
 DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables."
 HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
 SECTION = "devel"
 DEPENDS = "libelf"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36.orig.tar.gz\
-           ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz;patch=1\
-	   file://mvc-toolchain.patch;patch=1"
-
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36.orig.tar.gz \
+           ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz;patch=1"
 inherit autotools
 
 PARALLEL_MAKE = ""
@@ -20,6 +18,10 @@ export TARGET_CFLAGS = "${SELECTED_OPTIM
 
 export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include"
 
+do_configure_prepend() {
+	ln -sf ./linux-gnu sysdeps/linux-gnueabi
+}
+
 do_compile() {
 	oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE}
 }