[kaffe] CVS kaffe (guilhem): Fix bug #62

Kaffe CVS cvs-commits at kaffe.org
Sat Sep 16 08:33:23 PDT 2006


PatchSet 7417 
Date: 2006/09/16 15:08:17
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fix bug #62

        * developers/autogen.sh,
        developers/config4.patch: Removed config4.patch

        * libraries/javalib/external/classpath/configure.ac:
        Added checking for declaration of socklen_t in sys/socket.h

        *
        libraries/javalib/external/classpath/native/target/generic/target_generic_network.h:
        Added some replacement code for missing socklen_t.

        * libraries/javalib/external/classpath/config.guess,
        libraries/javalib/external/classpath/configure,
        libraries/javalib/external/classpath/ltmain.sh,
        libraries/javalib/external/classpath/include/config.h.in: Regenerated.

        Fix bug #62

Members: 
	ChangeLog:1.4919->1.4920 
	developers/autogen.sh:1.70->1.71 
	developers/config4.patch:1.1->1.2(DEAD) 
	libraries/javalib/external/classpath/config.guess:1.29->1.30 
	libraries/javalib/external/classpath/configure:1.31->1.32 
	libraries/javalib/external/classpath/configure.ac:1.18->1.19 
	libraries/javalib/external/classpath/ltmain.sh:1.29->1.30 
	libraries/javalib/external/classpath/include/config.h.in:1.8->1.9 
	libraries/javalib/external/classpath/native/target/generic/target_generic_network.h:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4919 kaffe/ChangeLog:1.4920
--- kaffe/ChangeLog:1.4919	Sat Sep 16 15:00:15 2006
+++ kaffe/ChangeLog	Sat Sep 16 15:08:17 2006
@@ -1,3 +1,22 @@
+2006-09-16  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* developers/autogen.sh,
+	developers/config4.patch: Removed config4.patch
+
+	* libraries/javalib/external/classpath/configure.ac:
+	Added checking for declaration of socklen_t in sys/socket.h
+
+	*
+	libraries/javalib/external/classpath/native/target/generic/target_generic_network.h:
+	Added some replacement code for missing socklen_t.
+
+	* libraries/javalib/external/classpath/config.guess,
+	libraries/javalib/external/classpath/configure,
+	libraries/javalib/external/classpath/ltmain.sh,
+	libraries/javalib/external/classpath/include/config.h.in: Regenerated.
+
+	Fix bug #62
+
 2006-09-16  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/vmspecific/Makefile.am (AM_JAVACFLAGS):
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.70 kaffe/developers/autogen.sh:1.71
--- kaffe/developers/autogen.sh:1.70	Sun Aug 13 01:46:55 2006
+++ kaffe/developers/autogen.sh	Sat Sep 16 15:08:28 2006
@@ -166,5 +166,4 @@
 
 (
   cd external/gcc/fastjar/scripts
-  patch -N -p0 <../../../../developers/config4.patch
 )
===================================================================
Checking out kaffe/developers/config4.patch
RCS:  /home/cvs/kaffe/kaffe/developers/Attic/config4.patch,v
VERS: 1.1
***************
--- kaffe/developers/config4.patch	Sat Sep 16 15:33:21 2006
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,17 +0,0 @@
-Index: config.sub
-===================================================================
-RCS file: /cvs/kaffe/kaffe/external/gcc/fastjar/scripts/config.sub,v
-retrieving revision 1.1
-diff -u -r1.1 config.sub
---- config.sub	9 Jan 2006 03:19:30 -0000	1.1
-+++ config.sub	25 Mar 2006 17:13:51 -0000
-@@ -1315,6 +1315,9 @@
- 	-kaos*)
- 		os=-kaos
- 		;;
-+	-*drops)
-+		os=-drops
-+		;;
- 	-zvmoe)
- 		os=-zvmoe
- 		;;
Index: kaffe/libraries/javalib/external/classpath/config.guess
diff -u kaffe/libraries/javalib/external/classpath/config.guess:1.29 kaffe/libraries/javalib/external/classpath/config.guess:1.30
--- kaffe/libraries/javalib/external/classpath/config.guess:1.29	Sun Jul 23 15:48:27 2006
+++ kaffe/libraries/javalib/external/classpath/config.guess	Sat Sep 16 15:08:29 2006
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-08-03'
+timestamp='2005-12-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -779,7 +779,7 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
+    x86:Interix*:[345]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -851,7 +851,7 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,7 +870,7 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -919,6 +919,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -964,7 +967,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -974,7 +977,7 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1185,7 +1188,6 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1263,6 +1265,9 @@
 	exit ;;
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
 esac
 
Index: kaffe/libraries/javalib/external/classpath/configure
diff -u kaffe/libraries/javalib/external/classpath/configure:1.31 kaffe/libraries/javalib/external/classpath/configure:1.32
--- kaffe/libraries/javalib/external/classpath/configure:1.31	Tue Aug 22 12:24:50 2006
+++ kaffe/libraries/javalib/external/classpath/configure	Sat Sep 16 15:08:30 2006
@@ -32119,6 +32119,63 @@
 fi
 
 
+echo "$as_me:$LINENO: checking for socklen_t in sys/socket.h" >&5
+echo $ECHO_N "checking for socklen_t in sys/socket.h... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _POSIX_PII_SOCKET
+		#include <sys/types.h>
+		#include <sys/socket.h>
+int
+main ()
+{
+socklen_t x = 5;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
+
+		 echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                           ac_config_files="$ac_config_files Makefile doc/Makefile doc/api/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile external/relaxngDatatype/Makefile gnu/classpath/Configuration.java gnu/java/security/Configuration.java include/Makefile native/Makefile native/fdlibm/Makefile native/jawt/Makefile native/jni/Makefile native/jni/classpath/Makefile native/jni/java-io/Makefile native/jni/java-lang/Makefile native/jni/java-net/Makefile native/jni/java-nio/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefile native/jni/gconf-peer/Makefile native/jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefile native/jni/midi-dssi/Makefile native/plugin/Makefile native/target/Makefile native/target/Linux/Makefile native/target/generic/Makefile resource/Makefile resource/META-INF/services/java.util.prefs.PreferencesFactory scripts/Makefile scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh tools/Makefile examples/Makefile examples/Makefile.jawt examples/Makefile.java2d"
Index: kaffe/libraries/javalib/external/classpath/configure.ac
diff -u kaffe/libraries/javalib/external/classpath/configure.ac:1.18 kaffe/libraries/javalib/external/classpath/configure.ac:1.19
--- kaffe/libraries/javalib/external/classpath/configure.ac:1.18	Tue Aug 22 12:24:53 2006
+++ kaffe/libraries/javalib/external/classpath/configure.ac	Sat Sep 16 15:08:32 2006
@@ -771,6 +771,14 @@
 fi
 AM_CONDITIONAL(ENABLE_LOCAL_SOCKETS, test "x$ENABLE_LOCAL_SOCKETS" = "xyes")
 
+AC_MSG_CHECKING([for socklen_t in sys/socket.h])
+AC_TRY_COMPILE([#define _POSIX_PII_SOCKET
+		#include <sys/types.h>
+		#include <sys/socket.h>], [socklen_t x = 5;],
+		[AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define it socklen_t typedef is in sys/socket.h.])
+		 AC_MSG_RESULT(yes)],
+		[AC_MSG_RESULT(no)])
+
 dnl -----------------------------------------------------------
 dnl Add the default preference peer
 dnl -----------------------------------------------------------
Index: kaffe/libraries/javalib/external/classpath/ltmain.sh
diff -u kaffe/libraries/javalib/external/classpath/ltmain.sh:1.29 kaffe/libraries/javalib/external/classpath/ltmain.sh:1.30
--- kaffe/libraries/javalib/external/classpath/ltmain.sh:1.29	Sun Jul 23 15:48:27 2006
+++ kaffe/libraries/javalib/external/classpath/ltmain.sh	Sat Sep 16 15:08:32 2006
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-2"
+VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,10 +2082,7 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -3203,11 +3200,6 @@
 	    current=`expr $number_major + $number_minor - 1`
 	    age="$number_minor"
 	    revision="$number_minor"
-	    ;;
-	  *)
-	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	  ;;
Index: kaffe/libraries/javalib/external/classpath/include/config.h.in
diff -u kaffe/libraries/javalib/external/classpath/include/config.h.in:1.8 kaffe/libraries/javalib/external/classpath/include/config.h.in:1.9
--- kaffe/libraries/javalib/external/classpath/include/config.h.in:1.8	Sun Jul 16 04:06:32 2006
+++ kaffe/libraries/javalib/external/classpath/include/config.h.in	Sat Sep 16 15:08:33 2006
@@ -162,6 +162,9 @@
 /* Define to 1 if you have the `socket' function. */
 #undef HAVE_SOCKET
 
+/* Define it socklen_t typedef is in sys/socket.h. */
+#undef HAVE_SOCKLEN_T
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
Index: kaffe/libraries/javalib/external/classpath/native/target/generic/target_generic_network.h
diff -u kaffe/libraries/javalib/external/classpath/native/target/generic/target_generic_network.h:1.3 kaffe/libraries/javalib/external/classpath/native/target/generic/target_generic_network.h:1.4
--- kaffe/libraries/javalib/external/classpath/native/target/generic/target_generic_network.h:1.3	Tue May 23 16:28:01 2006
+++ kaffe/libraries/javalib/external/classpath/native/target/generic/target_generic_network.h	Sat Sep 16 15:08:33 2006
@@ -56,6 +56,10 @@
 
 #include "target_native.h"
 
+#ifndef HAVE_SOCKLEN_T
+#define socklen_t int
+#endif
+
 /****************** Conditional compilation switches *******************/
 
 /***************************** Constants *******************************/




More information about the kaffe mailing list