From d4f985f2bc606c6767f6c2e96c36c434f4d9fd0b Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 16 Nov 2005 16:15:32 +0000
Subject: GCC 4 fixes for pcmcia-cs and openswan

git-svn-id: https://svn.o-hand.com/repos/poky@180 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/pcmcia-cs/files/gcc4_fixes.patch      | 26 ++++++++++++++++++++++
 openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 openembedded/packages/pcmcia-cs/files/gcc4_fixes.patch

(limited to 'openembedded/packages/pcmcia-cs')

diff --git a/openembedded/packages/pcmcia-cs/files/gcc4_fixes.patch b/openembedded/packages/pcmcia-cs/files/gcc4_fixes.patch
new file mode 100644
index 000000000..c68ba7a0f
--- /dev/null
+++ b/openembedded/packages/pcmcia-cs/files/gcc4_fixes.patch
@@ -0,0 +1,26 @@
+Index: pcmcia-cs-3.2.8/debug-tools/lspnp.c
+===================================================================
+--- pcmcia-cs-3.2.8.orig/debug-tools/lspnp.c	2002-02-13 05:45:01.000000000 +0000
++++ pcmcia-cs-3.2.8/debug-tools/lspnp.c	2005-11-11 23:43:33.000000000 +0000
+@@ -496,7 +496,7 @@
+ 		dump_io_fixed(r); break;
+ 	    }
+ 	}
+-	(u_char *)p += sz + 1;
++	p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }
+Index: pcmcia-cs-3.2.8/debug-tools/setpnp.c
+===================================================================
+--- pcmcia-cs-3.2.8.orig/debug-tools/setpnp.c	2001-10-10 02:58:12.000000000 +0000
++++ pcmcia-cs-3.2.8/debug-tools/setpnp.c	2005-11-11 23:44:32.000000000 +0000
+@@ -163,7 +163,7 @@
+ 		break;
+ 	    }
+ 	}
+-	(u_char *)p += sz + 1;
++	p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }
diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index fa685f8d5..e0ebf70d9 100644
--- a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r22"
+PR = "r23"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
 	   file://busybox.patch;patch=1 \
@@ -12,6 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
 	   file://automount.patch;patch=1 \
 	   file://ratoc-cfu1u.patch;patch=1 \
 	   file://no-hostap-cards.patch;patch=1 \
+	   file://gcc4_fixes.patch;patch=1 \
 	   file://pcmcia \
 	   file://ide.opts \
 	   file://wireless.opts \
-- 
cgit v1.2.3