[oe-commits] org.oe.dev classpath: Added patch fixing build on newer GCCs (and prevents a bug).

[thebohemian commit]

classpath: Added patch fixing build on newer GCCs (and prevents a bug).

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 23077a1452ab288ffafaa4f6e984a5dd9de2f0a1
ViewMTN: http://monotone.openembedded.org/revision/info/23077a1452ab288ffafaa4f6e984a5dd9de2f0a1
Files:
1
packages/classpath/files/javanet-local.patch
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/classpath/classpath_0.97.2.bb
Diffs:

#
# mt diff -re3e267f5e7794bd3108be424764b18c80d42e2bf -r23077a1452ab288ffafaa4f6e984a5dd9de2f0a1
#
#
#
# add_file "packages/classpath/files/javanet-local.patch"
#  content [74de086eb7903959d47d568b0c5659be8f77cdfa]
# 
# patch "packages/classpath/classpath_0.95.bb"
#  from [e7719be862652c7d80851c9e91f373cdcca5b3fb]
#    to [eda6d3cac12670b78a50f4ed467945e8d94251b5]
# 
# patch "packages/classpath/classpath_0.96.1.bb"
#  from [33e806e4b65b649a2b4005bd15cb10f3d86c7df7]
#    to [bbcb9594be6e39c9de041c9161493fdcca794c2b]
# 
# patch "packages/classpath/classpath_0.97.2.bb"
#  from [4fbb51684632f12c592c40ad772a35edea74b77e]
#    to [278cb300abf8c1fd2c84992aad5b9a71d2f050e5]
#
============================================================
--- packages/classpath/files/javanet-local.patch	74de086eb7903959d47d568b0c5659be8f77cdfa
+++ packages/classpath/files/javanet-local.patch	74de086eb7903959d47d568b0c5659be8f77cdfa
@@ -0,0 +1,37 @@
+Index: native/jni/java-net/local.c
+===================================================================
+RCS file: /sources/classpath/classpath/native/jni/java-net/local.c,v
+retrieving revision 1.4
+diff -u -r1.4 local.c
+--- native/jni/java-net/local.c	17 Apr 2007 21:46:27 -0000	1.4
++++ native/jni/java-net/local.c	27 Jun 2008 13:14:40 -0000
+@@ -73,27 +73,18 @@
+   return socket (PF_UNIX, stream ? SOCK_STREAM : SOCK_DGRAM, 0);
+ }
+ 
+-static int gcc_sucks = 0;
+-
+ int
+ local_bind (int fd, const char *addr)
+ {
+   struct sockaddr_un saddr;
+ 
+-  /* For some reason, GCC 4.0.1 on Darwin/x86 MODIFIES the `addr'
+-     pointer in the CALLER's STACK FRAME after calling this function,
+-     but if we add this statement below, it doesn't!  */
+-  if (gcc_sucks)
+-    fprintf (stderr, "bind %p\n", addr);
+-
+-  if (strlen (addr) > sizeof (saddr.sun_path))
++  if (strlen (addr) >= sizeof (saddr.sun_path))
+     {
+       errno = ENAMETOOLONG;
+       return -1;
+     }
+ 
+-  strncpy (saddr.sun_path, addr, sizeof (saddr.sun_path));
+-  saddr.sun_path[sizeof (saddr.sun_path)] = '\0';
++  strcpy (saddr.sun_path, addr);
+   saddr.sun_family = AF_LOCAL;
+ 
+   return bind (fd, (struct sockaddr *) &saddr, SUN_LEN (&saddr));
============================================================
--- packages/classpath/classpath_0.95.bb	e7719be862652c7d80851c9e91f373cdcca5b3fb
+++ packages/classpath/classpath_0.95.bb	eda6d3cac12670b78a50f4ed467945e8d94251b5
@@ -3,9 +3,10 @@ SRC_URI += "\
 SRC_URI += "\
   file://gjar-prefix-patch.diff;patch=1;pnum=0 \
   file://xmlstream-fix.patch;patch=1;pnum=0 \
+  file://javanet-local.patch;patch=1;pnum=0 \
   "
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS += "gtk+ gconf libxtst"
 
============================================================
--- packages/classpath/classpath_0.96.1.bb	33e806e4b65b649a2b4005bd15cb10f3d86c7df7
+++ packages/classpath/classpath_0.96.1.bb	bbcb9594be6e39c9de041c9161493fdcca794c2b
@@ -3,9 +3,10 @@ SRC_URI += "\
 SRC_URI += "\
   file://gjar-prefix-patch.diff;patch=1;pnum=0 \
   file://xmlstream-fix.patch;patch=1;pnum=0 \
+  file://javanet-local.patch;patch=1;pnum=0 \
   "
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS += "gtk+ gconf libxtst"
 
============================================================
--- packages/classpath/classpath_0.97.2.bb	4fbb51684632f12c592c40ad772a35edea74b77e
+++ packages/classpath/classpath_0.97.2.bb	278cb300abf8c1fd2c84992aad5b9a71d2f050e5
@@ -3,9 +3,10 @@ SRC_URI += "\
 SRC_URI += "\
   file://netif_16.patch;patch=1;pnum=0 \
   file://SimpleName.diff;patch=1;pnum=0 \
+  file://javanet-local;patch=1;pnum=0 \
   "
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "gtk+ gconf libxtst"