diff options
author | Richard Purdie <richard@openedhand.com> | 2005-11-16 16:15:32 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-11-16 16:15:32 +0000 |
commit | d4f985f2bc606c6767f6c2e96c36c434f4d9fd0b (patch) | |
tree | 0a55cfcf0297370bde159af6498e288c49d8b1c6 /openembedded/packages/pcmcia-cs | |
parent | 7183f6298a60d489ee534802ec5fdd63ba9028b8 (diff) | |
download | openembedded-core-d4f985f2bc606c6767f6c2e96c36c434f4d9fd0b.tar.gz openembedded-core-d4f985f2bc606c6767f6c2e96c36c434f4d9fd0b.tar.bz2 openembedded-core-d4f985f2bc606c6767f6c2e96c36c434f4d9fd0b.tar.xz openembedded-core-d4f985f2bc606c6767f6c2e96c36c434f4d9fd0b.zip |
GCC 4 fixes for pcmcia-cs and openswan
git-svn-id: https://svn.o-hand.com/repos/poky@180 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/pcmcia-cs')
-rw-r--r-- | openembedded/packages/pcmcia-cs/files/gcc4_fixes.patch | 26 | ||||
-rw-r--r-- | openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb | 3 |
2 files changed, 28 insertions, 1 deletions
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 \ |