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

@@ -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; \

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)/solaris/native/java/lang/java_props_macosx.c
-				$(openjdk-src)/macosx/native/sun/nio/ch/KQueueArrayWrapper.c
 		endif
 
 		openjdk-cflags += \

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)
 {