[oe-commits] org.oe.dev gdb-cross: fix issue where patch has already been applied to 6.6

[shanevolpe commit]

gdb-cross: fix issue where patch has already been applied to 6.6
gdb-cross version 6.6 fails the patch process because the sim-install.patch
tries to apply patches to Makefile-common which have already been merged into
gdm mainstream.

Attached is a patch for OE that seperates the two patches in sim-install.patch
so that gdb-cross 6.6 only applies the first one while gdb-cross 6.3 (which
also uses the sim-install.patch applies both.

Author: shanevolpe at gmail.com
Branch: org.openembedded.dev
Revision: 3f262d1fc267738f468c1c85010e34af5fe6bf38
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3f262d1fc267738f468c1c85010e34af5fe6bf38
Files:
1
packages/gdb/files/sim-install.patch
packages/gdb/files/sim-install-makefile-common.patch
packages/gdb/files/sim-install-makefile.patch
packages/gdb/gdb-cross_6.3.bb
packages/gdb/gdb-cross_6.6.bb
Diffs:

#
# mt diff -r23dabd48de15b4db8e9daecccce9ba8abe833091 -r3f262d1fc267738f468c1c85010e34af5fe6bf38
#
# 
# 
# delete "packages/gdb/files/sim-install.patch"
# 
# add_file "packages/gdb/files/sim-install-makefile-common.patch"
#  content [5aed0e951331218fdab047b9266e8be5a920332c]
# 
# add_file "packages/gdb/files/sim-install-makefile.patch"
#  content [19ef7ef85bd738c5eec1e6b2e7600018b8532e04]
# 
# patch "packages/gdb/gdb-cross_6.3.bb"
#  from [57212866af5d10d87ee69c7c3d50c01b73b31f42]
#    to [81a6b846e344bf1d6471af9fd0745cd48bebed7e]
# 
# patch "packages/gdb/gdb-cross_6.6.bb"
#  from [5a5b6cbcc19f880574e7608c27dda23f2a5bb060]
#    to [1ec57b5b81d4cd65c1ee6a541f1fe723975d9cd2]
# 
============================================================
--- packages/gdb/files/sim-install-makefile-common.patch	5aed0e951331218fdab047b9266e8be5a920332c
+++ packages/gdb/files/sim-install-makefile-common.patch	5aed0e951331218fdab047b9266e8be5a920332c
@@ -0,0 +1,22 @@
+--- gdb-6.1/sim/common/Make-common.in~sim-install.patch	2003-09-08 18:24:59.000000000 +0100
++++ gdb-6.1/sim/common/Make-common.in	2004-07-22 17:56:18.947423032 +0100
+@@ -581,14 +581,14 @@
+ 
+ install-common: installdirs
+ 	n=`echo run | sed '$(program_transform_name)'`; \
+-	$(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT)
++	$(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
+ 	n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
+-	$(INSTALL_DATA) libsim.a $(libdir)/$$n ; \
+-	( cd $(libdir) ; $(RANLIB) $$n )
++	$(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \
++	( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n )
+ 
+ installdirs:
+-	$(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)
+-	$(SHELL) $(srcdir)/../../mkinstalldirs $(libdir)
++	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir)
++	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir)
+ 
+ check:
+ 	cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)"
============================================================
--- packages/gdb/files/sim-install-makefile.patch	19ef7ef85bd738c5eec1e6b2e7600018b8532e04
+++ packages/gdb/files/sim-install-makefile.patch	19ef7ef85bd738c5eec1e6b2e7600018b8532e04
@@ -0,0 +1,11 @@
+--- gdb-6.6~org/sim/common/Makefile.in	2007-01-30 09:23:31.000000000 -0500
++++ gdb-6.6/sim/common/Makefile.in	2007-01-30 09:25:32.000000000 -0500
+@@ -34,7 +34,7 @@
+ 
+ datadir = @datadir@
+ mandir = @mandir@
+-man1dir = $(mandir)/man1
++man1dir = $(DESTDIR)$(mandir)/man1
+ infodir = @infodir@
+ includedir = @includedir@
+ 
============================================================
--- packages/gdb/gdb-cross_6.3.bb	57212866af5d10d87ee69c7c3d50c01b73b31f42
+++ packages/gdb/gdb-cross_6.3.bb	81a6b846e344bf1d6471af9fd0745cd48bebed7e
@@ -5,9 +5,12 @@ inherit autotools sdk
 
 inherit autotools sdk
 
+PR = "r1"
+
 S = "${WORKDIR}/gdb-${PV}"
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	file://sim-install.patch;patch=1"
+	file://sim-install-makefile.patch;patch=1 \
+	file://sim-install-makefile-common.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
 
============================================================
--- packages/gdb/gdb-cross_6.6.bb	5a5b6cbcc19f880574e7608c27dda23f2a5bb060
+++ packages/gdb/gdb-cross_6.6.bb	1ec57b5b81d4cd65c1ee6a541f1fe723975d9cd2
@@ -6,9 +6,11 @@ inherit autotools sdk
 
 inherit autotools sdk
 
+PR = "r1"
+
 S = "${WORKDIR}/gdb-${PV}"
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	file://sim-install.patch;patch=1"
+	file://sim-install-makefile.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"