[kaffe] CVS kaffe (robilad): fixed test on freebsd

Kaffe CVS cvs-commits at kaffe.org
Fri Jul 14 12:43:33 PDT 2006


PatchSet 7336 
Date: 2006/07/14 19:15:19
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed test on freebsd

2006-07-14  Ito Kazumitsu  <kaz at maczuka.gcd.org>

        * test/jni/Makefile.am: (AM_CFLAGS):
        Created.

Members: 
	ChangeLog:1.4839->1.4840 
	libraries/javalib/external/classpath/config.guess:1.26->1.27 
	libraries/javalib/external/classpath/ltmain.sh:1.26->1.27 
	scripts/ltmain.sh:1.30->1.31 
	test/jni/Makefile.am:1.14->1.15 
	test/jni/Makefile.in:1.74->1.75 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4839 kaffe/ChangeLog:1.4840
--- kaffe/ChangeLog:1.4839	Thu Jul 13 21:11:48 2006
+++ kaffe/ChangeLog	Fri Jul 14 19:15:19 2006
@@ -1,3 +1,8 @@
+2006-07-14  Ito Kazumitsu  <kaz at maczuka.gcd.org>
+
+	* test/jni/Makefile.am: (AM_CFLAGS):
+	Created.
+
 2006-07-13  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	Reported by Riccardo Mottola <mottola at kaffe.org>
Index: kaffe/libraries/javalib/external/classpath/config.guess
diff -u kaffe/libraries/javalib/external/classpath/config.guess:1.26 kaffe/libraries/javalib/external/classpath/config.guess:1.27
--- kaffe/libraries/javalib/external/classpath/config.guess:1.26	Thu Jul 13 20:24:07 2006
+++ kaffe/libraries/javalib/external/classpath/config.guess	Fri Jul 14 19:15:43 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-12-13'
+timestamp='2005-08-03'
 
 # 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*:[345]*)
+    x86:Interix*:[34]*)
 	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 | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	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 | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -919,9 +919,6 @@
     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 ;;
@@ -967,7 +964,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI)
+	#ifdef __INTEL_COMPILER
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -977,7 +974,7 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1188,6 +1185,7 @@
     *: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}
@@ -1265,9 +1263,6 @@
 	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/ltmain.sh
diff -u kaffe/libraries/javalib/external/classpath/ltmain.sh:1.26 kaffe/libraries/javalib/external/classpath/ltmain.sh:1.27
--- kaffe/libraries/javalib/external/classpath/ltmain.sh:1.26	Thu Jul 13 20:24:07 2006
+++ kaffe/libraries/javalib/external/classpath/ltmain.sh	Fri Jul 14 19:15:44 2006
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
 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,7 +2082,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -3200,6 +3203,11 @@
 	    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/scripts/ltmain.sh
diff -u kaffe/scripts/ltmain.sh:1.30 kaffe/scripts/ltmain.sh:1.31
--- kaffe/scripts/ltmain.sh:1.30	Thu Jul 13 20:24:10 2006
+++ kaffe/scripts/ltmain.sh	Fri Jul 14 19:15:46 2006
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
 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,7 +2082,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -3200,6 +3203,11 @@
 	    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/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.14 kaffe/test/jni/Makefile.am:1.15
--- kaffe/test/jni/Makefile.am:1.14	Sat Dec  3 12:55:13 2005
+++ kaffe/test/jni/Makefile.am	Fri Jul 14 19:15:48 2006
@@ -8,6 +8,9 @@
 
 check_PROGRAMS= jniBase jniExecClass jniReflect jniWeakTest
 
+AM_CFLAGS = \
+	$(KAFFE_CFLAGS)
+
 AM_CPPFLAGS= \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include -I$(top_srcdir)/include/kaffe \
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.74 kaffe/test/jni/Makefile.in:1.75
--- kaffe/test/jni/Makefile.in:1.74	Thu Jul 13 20:24:13 2006
+++ kaffe/test/jni/Makefile.in	Fri Jul 14 19:15:49 2006
@@ -379,6 +379,9 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+AM_CFLAGS = \
+	$(KAFFE_CFLAGS)
+
 AM_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include -I$(top_srcdir)/include/kaffe \




More information about the kaffe mailing list