From bcbce54b9ec0295da3aa3094b2f6c4a9ca35d4a1 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Thu, 24 Jul 2014 11:20:17 -0600
Subject: [PATCH] fix iOS build when using recent versions of OpenJDK 7

This is based on recent feedback on the Avian group.  I've tested it
using both OpenJDK 7u40 and 7u60.
---
 makefile                           | 7 +++++++
 openjdk-src.mk                     | 6 +++---
 src/openjdk/my_java_props_macosx.c | 6 ++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index e9e2076440..988a533144 100755
--- a/makefile
+++ b/makefile
@@ -2007,6 +2007,13 @@ ifeq ($(platform),ios)
 		-e 's/^#ifdef __APPLE__/#if 0/' \
 		< "$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c" \
 		> $(build)/openjdk/UNIXProcess_md.c
+	if [ -e "$(openjdk-src)/solaris/native/java/lang/childproc.h" ]; then \
+		sed \
+			-e 's/^#ifndef __APPLE__/#if 1/' \
+			-e 's/^#ifdef __APPLE__/#if 0/' \
+			< "$(openjdk-src)/solaris/native/java/lang/childproc.h" \
+			> $(build)/openjdk/childproc.h; \
+	fi
 endif
 	if [ -f openjdk-patches/$(notdir $(<)).patch ]; then \
 		( cd $(build) && patch -p0 ) < openjdk-patches/$(notdir $(<)).patch; \
diff --git a/openjdk-src.mk b/openjdk-src.mk
index 6444bc48be..4e1d1bdf5e 100644
--- a/openjdk-src.mk
+++ b/openjdk-src.mk
@@ -331,15 +331,15 @@ else
 
 	ifeq ($(kernel),darwin)
 		openjdk-sources += \
-			$(openjdk-src)/solaris/native/java/net/bsd_close.c
+			$(openjdk-src)/solaris/native/java/net/bsd_close.c \
+			$(openjdk-src)/macosx/native/sun/nio/ch/KQueueArrayWrapper.c
 
 		ifeq ($(platform),ios)
 			openjdk-local-sources += \
 				$(src)/openjdk/my_java_props_macosx.c
 		else
 			openjdk-sources += \
-				$(openjdk-src)/solaris/native/java/lang/java_props_macosx.c \
-				$(openjdk-src)/macosx/native/sun/nio/ch/KQueueArrayWrapper.c
+				$(openjdk-src)/solaris/native/java/lang/java_props_macosx.c
 		endif
 
 		openjdk-cflags += \
diff --git a/src/openjdk/my_java_props_macosx.c b/src/openjdk/my_java_props_macosx.c
index 19de63cb35..f6833283f6 100644
--- a/src/openjdk/my_java_props_macosx.c
+++ b/src/openjdk/my_java_props_macosx.c
@@ -19,6 +19,12 @@ setProxyProperties(java_props_t* props)
   // ignore
 }
 
+void
+setUserHome(java_props_t* props)
+{
+  // ignore
+}
+
 char*
 setupMacOSXLocale(int cat)
 {