Re: PR/44222 kaffe halts on BufferedReader.readLine (while building wip/jdk15)

["B ICT A.P. de Brouwer Jr." <noud4%home.nl@localhost>]

On Tue, 2010-12-14 at 02:10 +0000, David Brownlee wrote:
>  > Yes, configure.ac should be patched and not thread-impl.c.

>  Do you have time to provide such a patch? :)

I did take time for this resulting in:
-a patch to lang/kaffe/Makefile.common to recreate configure.
-3 extra patches against
   config/config.h.in, configure.ac and config/config.alias.
-and thus a changed distinfo.

find them attached (hope gnats shows them okay too),
-- 

--- Makefile.common.orig        2010-03-24 19:43:25.000000000 +0000
+++ Makefile.common     2010-12-15 15:19:02.000000000 +0000
@@ -18,6 +18,7 @@
 JAVA_HOME=             ${PREFIX}/java/kaffe
 JAVA_NAME=             kaffe
 USE_LIBTOOL=           yes
+USE_TOOLS+=            autoconf
 USE_TOOLS+=            gmake
 TEST_TARGET=           check
 
@@ -58,6 +59,9 @@
 CONFIGURE_ARGS+=       --with-engine=intrp
 .endif
 
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 .include "../../devel/libltdl/convenience.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

$NetBSD$

--- config/config.h.in  2010-12-15 15:28:42.000000000 +0100
+++ config/config.h.in.new      2010-12-15 15:31:15.000000000 +0100
@@ -771,7 +771,7 @@
 /* additional directories to search for native jni libraries */
 #undef JNI_LIBRARY_PATH
 
-/* Defined on NetBSD because sigwait needs the handle not to be registered */
+/* Defined on NetBSD 1.6.2 and lower because sigwait needs the handle not to 
be registered */
 #undef KAFFE_BUGGY_NETBSD_SIGWAIT
 
 /* Full path to the directory containing kaffe's locales */

$NetBSD$

--- configure.ac        2010-12-15 15:08:20.000000000 +0100
+++ configure.ac.new    2010-12-15 15:10:10.000000000 +0100
@@ -266,6 +266,7 @@
 known=no
 Khost_cpu=$host_cpu
 Khost_os=$host_os
+Knetbsd1=no
 if test -f $srcdir/config/config.alias ; then
        . $srcdir/config/config.alias
 fi
@@ -709,7 +710,9 @@
        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
 
        if test "x$Khost_os" = "xnetbsd1"; then
-               AC_DEFINE(KAFFE_BUGGY_NETBSD_SIGWAIT, 1, [Defined on NetBSD 
because sigwait needs the handle not to be registered])
+               if test "x$Knetbsd1" = "xyes"; then
+                       AC_DEFINE(KAFFE_BUGGY_NETBSD_SIGWAIT, 1, [Defined on 
NetBSD because sigwait needs the handle not to be registered])
+               fi
        fi
  else
         CPPFLAGS="$CPPFLAGS -DBR_PTHREADS=0"

$NetBSD$

--- config/config.alias 2006-03-23 20:52:54.000000000 +0100
+++ config/config.alias.new     2010-12-15 15:07:07.000000000 +0100
@@ -21,6 +21,11 @@
 
 esac
 
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+case "${UNAME_RELEASE}" in
+    1*) Knetbsd1=yes ;;
+esac
+
 case "$Khost_os" in
 
 aix*)          Khost_os=aix ;;