From b9de798e03f412647d850e8fc293c67d41437f1e Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Thu, 27 Jun 2002 05:34:39 +0000
Subject: [PATCH] Add a pre-build target to check for a setting of WRKDIRPREFIX
 which will result in the InvokerGen.java target failing.  The bootstrapping
 Linux JDK will confuse itself if WRKDIRPREFIX also exists in /compat/linux as
 a symbolic link to the directory in the standard FreeBSD hierarchy.

Much appreciated sleuth work by:	dillon
---
 java/jdk13/Makefile | 13 +++++++++++++
 java/jdk14/Makefile | 13 +++++++++++++
 java/jdk15/Makefile | 13 +++++++++++++
 java/jdk16/Makefile | 13 +++++++++++++
 4 files changed, 52 insertions(+)

diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 3ace31bc864f..aca08da79be3 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -117,6 +117,19 @@ pre-patch:
 		${MKDIR} hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
 			${PATCH} < ${WRKDIR}/jdk131.patches
 
+.if !defined(NATIVE_BOOTSTRAP)
+pre-build:
+	@if [ "$${WRKDIRPREFIX}" -a \
+	     -L "/compat/linux/$${WRKDIRPREFIX}" -a \
+	     x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \
+	then \
+		echo "Please set WRKDIRPREFIX to something which doesn't"; \
+		echo "have a matching symbolic link in /compat/linux."; \
+		echo "This is known to cause problems during bootstrapping."; \
+		exit 1; \
+	fi
+.endif
+
 post-build:
 	# Prune empty dirs
 	${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index 3ace31bc864f..aca08da79be3 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -117,6 +117,19 @@ pre-patch:
 		${MKDIR} hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
 			${PATCH} < ${WRKDIR}/jdk131.patches
 
+.if !defined(NATIVE_BOOTSTRAP)
+pre-build:
+	@if [ "$${WRKDIRPREFIX}" -a \
+	     -L "/compat/linux/$${WRKDIRPREFIX}" -a \
+	     x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \
+	then \
+		echo "Please set WRKDIRPREFIX to something which doesn't"; \
+		echo "have a matching symbolic link in /compat/linux."; \
+		echo "This is known to cause problems during bootstrapping."; \
+		exit 1; \
+	fi
+.endif
+
 post-build:
 	# Prune empty dirs
 	${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 3ace31bc864f..aca08da79be3 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -117,6 +117,19 @@ pre-patch:
 		${MKDIR} hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
 			${PATCH} < ${WRKDIR}/jdk131.patches
 
+.if !defined(NATIVE_BOOTSTRAP)
+pre-build:
+	@if [ "$${WRKDIRPREFIX}" -a \
+	     -L "/compat/linux/$${WRKDIRPREFIX}" -a \
+	     x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \
+	then \
+		echo "Please set WRKDIRPREFIX to something which doesn't"; \
+		echo "have a matching symbolic link in /compat/linux."; \
+		echo "This is known to cause problems during bootstrapping."; \
+		exit 1; \
+	fi
+.endif
+
 post-build:
 	# Prune empty dirs
 	${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 3ace31bc864f..aca08da79be3 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -117,6 +117,19 @@ pre-patch:
 		${MKDIR} hotspot1.3.1/src/os_cpu/bsd_i486/vm && \
 			${PATCH} < ${WRKDIR}/jdk131.patches
 
+.if !defined(NATIVE_BOOTSTRAP)
+pre-build:
+	@if [ "$${WRKDIRPREFIX}" -a \
+	     -L "/compat/linux/$${WRKDIRPREFIX}" -a \
+	     x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \
+	then \
+		echo "Please set WRKDIRPREFIX to something which doesn't"; \
+		echo "have a matching symbolic link in /compat/linux."; \
+		echo "This is known to cause problems during bootstrapping."; \
+		exit 1; \
+	fi
+.endif
+
 post-build:
 	# Prune empty dirs
 	${FIND} ${JDKIMAGEDIR} -type d | ${SORT} -r | \