openbsd-ports/devel/jdk/1.6/patches/patch-hotspot_build_bsd_Makefile

14 lines
640 B
Plaintext

$OpenBSD: patch-hotspot_build_bsd_Makefile,v 1.1 2011/10/07 02:04:12 kurt Exp $
--- hotspot/build/bsd/Makefile.orig Mon Sep 26 16:56:07 2011
+++ hotspot/build/bsd/Makefile Mon Sep 26 16:59:17 2011
@@ -237,8 +237,7 @@ endif
XSLT_CHECK = $(RUN.JAVAP) javax.xml.transform.TransformerFactory
# If not found then fail fast.
check_j2se_version:
- $(QUIETLY) $(XSLT_CHECK) > /dev/null 2>&1; \
- if [ $$? -ne 0 ]; then \
+ $(QUIETLY) if [ `$(RUN.JAVA) -fullversion 2>&1 | grep -c '1\.[4567]'` -eq 0 ] ; then \
$(RUN.JAVA) -version; \
echo "*** An XSLT processor (J2SE 1.4.x or newer) is required" \
"to bootstrap this build" 1>&2; \