[oe-commits] Dmitry Eremin-Solenikov : gdb: fix building of sim/ppc

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 48c3c12e764e706ce8148aaf4c0098c675f9da41
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=48c3c12e764e706ce8148aaf4c0098c675f9da41

Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date:   Tue Jun 15 16:48:51 2010 +0400

gdb: fix building of sim/ppc

One shouldn't depend on $(LIBS) value, as it contains -lz-like things, not only filenames.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>

---

 recipes/gdb/files/gdb-fix-sim-ppc.patch |   13 +++++++++++++
 recipes/gdb/gdb-cross-sdk_7.1.bb        |    4 +++-
 recipes/gdb/gdb-cross_7.1.bb            |    4 +++-
 recipes/gdb/gdb_7.1.bb                  |    1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/recipes/gdb/files/gdb-fix-sim-ppc.patch b/recipes/gdb/files/gdb-fix-sim-ppc.patch
new file mode 100644
index 0000000..9457991
--- /dev/null
+++ b/recipes/gdb/files/gdb-fix-sim-ppc.patch
@@ -0,0 +1,13 @@
+Index: gdb-7.1/sim/ppc/Makefile.in
+===================================================================
+--- gdb-7.1.orig/sim/ppc/Makefile.in	2010-06-15 16:37:51.103007443 +0400
++++ gdb-7.1/sim/ppc/Makefile.in	2010-06-15 16:38:07.417068246 +0400
+@@ -551,7 +551,7 @@
+ PACKAGE_OBJ = @sim_pk_obj@
+ 
+ 
+-psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP)
++psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP)
+ 	$(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
+ 
+ run: psim
diff --git a/recipes/gdb/gdb-cross-sdk_7.1.bb b/recipes/gdb/gdb-cross-sdk_7.1.bb
index 54cc113..27d5ac8 100644
--- a/recipes/gdb/gdb-cross-sdk_7.1.bb
+++ b/recipes/gdb/gdb-cross-sdk_7.1.bb
@@ -2,7 +2,9 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch"
+            file://gdb-6.8-fix-compile-karmic.patch \
+	    file://gdb-fix-sim-ppc.patch \
+	   "
 
 DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
diff --git a/recipes/gdb/gdb-cross_7.1.bb b/recipes/gdb/gdb-cross_7.1.bb
index 2c022db..bd2b704 100644
--- a/recipes/gdb/gdb-cross_7.1.bb
+++ b/recipes/gdb/gdb-cross_7.1.bb
@@ -2,7 +2,9 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += " \
-            file://gdb-6.8-fix-compile-karmic.patch"
+            file://gdb-6.8-fix-compile-karmic.patch \
+	    file://gdb-fix-sim-ppc.patch \
+           "
 
 SRC_URI[md5sum] = "01a6ce13bab5307cfac5c405e4afd1cf"
 SRC_URI[sha256sum] = "fc839b5226b94e58a5c7a526e67b7f8f93c7829d05dae1b6247f1bfe3829f291"
diff --git a/recipes/gdb/gdb_7.1.bb b/recipes/gdb/gdb_7.1.bb
index a73eb72..e829b9b 100644
--- a/recipes/gdb/gdb_7.1.bb
+++ b/recipes/gdb/gdb_7.1.bb
@@ -5,6 +5,7 @@ PR = "r1"
 
 SRC_URI += "file://gdb-6.8-fix-compile-karmic.patch \
 	    file://gdb-tcsetpgrp.patch \
+	    file://gdb-fix-sim-ppc.patch \
 	   "
 
 # Work-around problems while creating libbfd.a