From dcab2a88f97e26429e9c9faa3baa1e13b3ad7387 Mon Sep 17 00:00:00 2001 From: abs Date: Wed, 15 Dec 2010 16:06:26 +0000 Subject: apply patches from Noud to fix PR/44222 kaffe halts on BufferedReader.readLine (while building wip/jdk15) KAFFE_BUGGY_NETBSD_SIGWAIT is only required in older NetBSD releases, and in fact breaks NetBSD 5 Bump PKGREVISION many thanks --- lang/kaffe/Makefile | 4 ++-- lang/kaffe/Makefile.common | 9 +++++++-- lang/kaffe/PLIST | 4 ++-- lang/kaffe/distinfo | 5 ++++- lang/kaffe/patches/patch-ca | 16 ++++++++++++++++ lang/kaffe/patches/patch-cb | 26 ++++++++++++++++++++++++++ lang/kaffe/patches/patch-cc | 19 +++++++++++++++++++ 7 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 lang/kaffe/patches/patch-ca create mode 100644 lang/kaffe/patches/patch-cb create mode 100644 lang/kaffe/patches/patch-cc (limited to 'lang/kaffe') diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index da224517cc2..babf32b610b 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.74 2009/12/15 23:41:45 joerg Exp $ +# $NetBSD: Makefile,v 1.75 2010/12/15 16:06:26 abs Exp $ # .include "Makefile.common" -PKGREVISION= 5 +PKGREVISION= 6 CONFLICTS+= kaffe-nox11-[0-9]* diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common index b77bc5fb9ec..d0b7670c316 100644 --- a/lang/kaffe/Makefile.common +++ b/lang/kaffe/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.21 2010/03/24 19:43:25 asau Exp $ +# $NetBSD: Makefile.common,v 1.22 2010/12/15 16:06:26 abs Exp $ +# used by lang/kaffe-x11/Makefile DISTNAME= kaffe-1.1.7 -PKGREVISION= 1 CATEGORIES= lang java MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ @@ -18,6 +18,7 @@ GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} JAVA_HOME= ${PREFIX}/java/kaffe JAVA_NAME= kaffe USE_LIBTOOL= yes +USE_TOOLS+= autoconf USE_TOOLS+= gmake TEST_TARGET= check @@ -58,6 +59,10 @@ CONFIGURE_ENV+= VM_LIBS="-lc" CONFIGURE_ARGS+= --with-engine=intrp .endif +# This & USE_TOOLS+=autoconf can be retired after patch-c[abc] taken upstream +pre-configure: + cd ${WRKSRC} && autoconf + .include "../../devel/libltdl/convenience.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST index 7ae4bc0e722..b5939d9c8b2 100644 --- a/lang/kaffe/PLIST +++ b/lang/kaffe/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2009/12/14 18:32:08 joerg Exp $ +@comment $NetBSD: PLIST,v 1.18 2010/12/15 16:06:26 abs Exp $ bin/kaffe-appletviewer bin/kaffe-jar bin/kaffe-java @@ -66,9 +66,9 @@ java/kaffe/lib/logging.properties java/kaffe/lib/security/classpath.security java/kaffe/lib/tools.jar java/kaffe/license.terms -man/man1/kaffe.1 java/kaffe/share/classpath/README java/kaffe/share/classpath/tools.zip +man/man1/kaffe.1 share/locale/de/LC_MESSAGES/kaffe.mo share/locale/fr/LC_MESSAGES/kaffe.mo share/locale/zh_CN/LC_MESSAGES/kaffe.mo diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo index dcf3d7ed39d..6f8b3d372a3 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2009/12/22 12:44:59 joerg Exp $ +$NetBSD: distinfo,v 1.29 2010/12/15 16:06:26 abs Exp $ SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817 RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b @@ -14,3 +14,6 @@ SHA1 (patch-ah) = 0c4f0f9fabbbcaeddeb0eb757ed11babe383693f SHA1 (patch-ba) = 945e31bbd87c9da3e18b8bae6b4042f448c7cd66 SHA1 (patch-bb) = 693db57c01438620cd722e172c7751070efc2989 SHA1 (patch-bc) = f00d541613db81540bcd21ddc68f7b27232024b6 +SHA1 (patch-ca) = 0dc783a8e78016ef5e5e2f3392644690e3a2de9a +SHA1 (patch-cb) = c698b0a2e078cc035dfd7401617fc8d4c2ef5fbe +SHA1 (patch-cc) = df48315c9470d433e33fd80136d7bf7f60f83e1d diff --git a/lang/kaffe/patches/patch-ca b/lang/kaffe/patches/patch-ca new file mode 100644 index 00000000000..a57c260cf20 --- /dev/null +++ b/lang/kaffe/patches/patch-ca @@ -0,0 +1,16 @@ +$NetBSD: patch-ca,v 1.1 2010/12/15 16:06:26 abs Exp $ + +KAFFE_BUGGY_NETBSD_SIGWAIT is only required in older NetBSD releases, and +in fact breaks NetBSD 5 + +--- 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 */ diff --git a/lang/kaffe/patches/patch-cb b/lang/kaffe/patches/patch-cb new file mode 100644 index 00000000000..a8ce87b0a00 --- /dev/null +++ b/lang/kaffe/patches/patch-cb @@ -0,0 +1,26 @@ +$NetBSD: patch-cb,v 1.1 2010/12/15 16:06:26 abs Exp $ + +KAFFE_BUGGY_NETBSD_SIGWAIT is only required in older NetBSD releases, and +in fact breaks NetBSD 5 + +--- 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" diff --git a/lang/kaffe/patches/patch-cc b/lang/kaffe/patches/patch-cc new file mode 100644 index 00000000000..56b81730862 --- /dev/null +++ b/lang/kaffe/patches/patch-cc @@ -0,0 +1,19 @@ +$NetBSD: patch-cc,v 1.1 2010/12/15 16:06:26 abs Exp $ + +KAFFE_BUGGY_NETBSD_SIGWAIT is only required in older NetBSD releases, and +in fact breaks NetBSD 5 + +--- 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 ;; -- cgit v1.2.3